Merge "Fixed an issue where the player would flicker on when expanding" into...
Merge "Fixed an issue where the player would flicker on when expanding" into rvc-dev am: 831fce06 am: 5773df6b am: 1a9e9bf9
Change-Id: Iec344aa42a16374561197d8d349715a32b4877a7