Merge "Marking split screen rotate tests as flaky"