Merge "BatteryStats: Fix BleScan apportioning"