Merge "Don't break things if a network goes back to CONNECTED." into lmp-preview-dev