Merge "onDestroy, remove messages+callbacks on handler" into rvc-dev am: 6a68d3d8a0

Change-Id: Iebdb41f573410191a61f292c5af7f331b117160b