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