Merge "Keep rotation transform for exiting PiP with fixed rotation" into tm-qpr-dev