Merge "Stop reconnecting on uuid change when a manual disconnection happens." into main