Merge "Update enter split-screen flicker tests"