Merge "Merge "Fixed an  issue where the media would reappear animated" into rvc-dev am: 93920d3b10 am: 6455510f71 am: 1eeb5d79ea" into rvc-qpr-dev-plus-aosp