Merge "Fix @Nullability mismatch with PipTransition" into udc-qpr-dev