Merge "Fix the animation position when launch into PiP" into tm-dev