Merge "Fix full-charge timestamp lost in battery chart graph." into main