Merge "snapuserd: Fix race condition in MergeWorker::WaitForMergeBegin." into main