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: 9772d394 am: 87f76c6a am: e5d17c30
Change-Id: I2b7e4801c6b789e0714a376fb80781fade3f7973