Merge "Fix typo in EnterPipToOtherOrientationTest" into tm-qpr-dev