Merge "Crop the surface using the rect hint before animating out of PIP" into sc-dev