Merge "Reset monotonic size of battery history on history.reset()" into main