Merge "Make sure that local syncs are never blocked on cloud syncs" into udc-mainline-prod