Merge "Some battery stats history fixes." into lmp-preview-dev