Merge "Disable flaky split screen test"