Merge "Revert "Fix splitting with wrong apps when entering split with rotation"" into tm-qpr-dev