Merge "onDestroy, remove messages+callbacks on handler" into rvc-dev am: 6a68d3d8 am: e0054e3e am: bcc15250 Change-Id: Ie0e89d6993b8b88af79714243a9fc4cad69a21f5