* commit 'c3014c8cf8932cb6a482e985edc7def97c50eede': Fix issue #17705755: Battery stats resets at incorrect times