Merge "Fix the regression of PiP position in fixed rotation" into tm-qpr-dev