Merge "Add unoptimized ble scans to batterystats." into oc-dev