Merge "Clean up the legacy split screen (3/n)"