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