Merge "Re-show faded PiP when fixed rotation is finished" into udc-dev