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