Merge "Support disconnecting while trying to connect."