Merge "6-1/ Integrate SplitScreen rotation flicker tests"