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