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 am: b02d1c55
Change-Id: I0dfb3f7ced40b4aa965c753dd6ff539c282c4d32