Merge "Batterystats track background bad ble scan time" into oc-dev