Merge "Stops BLE scan when scan only mode is disabled." into mnc-dev