* commit 'd89f0d3d54dec1662b1cfed6c8e574ffcc8032d9': Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"
* commit 'd89f0d3d54dec1662b1cfed6c8e574ffcc8032d9': Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"