Merge "onDestroy, remove messages+callbacks on handler" into rvc-dev