Merge "Fix flaky legacy split screen flicker tests" into sc-dev