Merge "BatteryStats receives custom measured energies" into sc-dev