Merge "Merge "Fixed an issue where the media would reappear animated" into rvc-dev am: 93920d3b am: 6455510f am: 1eeb5d79" into rvc-qpr-dev-plus-aosp