Merge "Remove callbacks and messages in onDestroy()." into rvc-dev-plus-aosp