Fix max charge override being set during charge pre-pass (#9442)

Fix max charge override being set during charge pre-pass (#9442) #10995