Merge "Fix volume delete_group data race in clean up"