Merge "Batterystats handles nested unoptimized ble scans" into oc-dr1-dev