Merge "Add fallback logic to cancel entering split screen" into tm-qpr-dev