Merge "Merge "Apply syncPipSurfaceState synchronously" into udc-dev am: cc112e1010 am: b2d50afc27"