Merge "Consolidate entering split screen behavior" into tm-qpr-dev