Merge "snapuserd: Lock the buffer during snapshot-merge" into main