Merge "Merge "Unregister MediaListener on view detached" into rvc-dev am: 61b59360 am: 913fd110" into rvc-d1-dev-plus-aosp