Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev