Merge "Handle a possible volume attachment visibility wait/race issue"