Merge "StopScan before each new Companion device scan" into oc-dev