Merge "Fix the scale for entering PiP animation" into tm-qpr-dev