Merge "Fixed an issue where the player would flicker on when expanding" into rvc-dev