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
Change-Id: If36d16992ac899a28e86eebcc549fe763f7394b3