Merge "Add waiters after creating volume transfer for related tests"