Merge "Clean up the legacy split screen (7/n)" into tm-dev