Merge "Fix SurfaceSyncGroupTests" into udc-dev