Merge "Consolidate leaving split screen to pip mode behavior" into tm-qpr-dev