Merge "Fix some legacy-transition timing issues in split-screen" into sc-dev