Merge "Cleanup the legacy split screen (1/n)"