Merge "Do not trigger scan for reconnect() when wifi is connected" into oc-mr1-dev