Merge "Fix issue #17705755: Battery stats resets at incorrect times" into lmp-dev