Merge "Keep recording battery history when already charged" into main