Merge "Fix wrong surface positioning when animating a split pair to home" into udc-dev