Merge "SnapshotManager::WaitForMerge gives more info"