Merge "Fix broken transition when caceling enter split screen" into tm-qpr-dev