Merge "Battery chart fixes." into lmp-dev