Merge "Bug 2948: Perform create snapshot synchronously"