Merge "Refactor PiP2 resize transitions" into main