Merge "Wifi connection hysteresis" into oc-mr1-dev