Merge "Improve logic around battery history time base" into udc-dev