Merge "Prevent callbacks being called before the constructor" into rvc-dev am: 8c6907d5 am: 72d06b50 am: ce314dfa Change-Id: I261c89ecf00cfa871a04cdaa31bfee008d1c3ee2