Merge "Apply syncPipSurfaceState synchronously" into udc-dev