automerge: 56d2e8f * commit '56d2e8fb7b2ab6e32efea59604eb0cd72745df1b': Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions.
automerge: 56d2e8f * commit '56d2e8fb7b2ab6e32efea59604eb0cd72745df1b': Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions.