Merge "Batterystats CTS test: background BLE scan" into oc-dev