Merge "Change PIP exit transition to a scale and uncrop"