Merge "DO NOT MERGE - Support disconnecting while trying to connect." into lmp-preview-dev