Merge "Deal with daylight savings time in battery chart."