Merge "Add EnergyConsumer data to battery history"