Merge "Fix threshold for fastCharging" into 24D1-dev