Merge "Do not remove surface when resetting previous PiP" into udc-qpr-dev