Merge "Break out battery history reading into a separate class" into sc-dev