Merge "Merge "Fix broken transition when caceling enter split screen" into tm-qpr-dev am: 1520689a am: 95debf6e"