Merge "Animate PiP with considering next rotation" into udc-dev