Merge "Add api to change charging state update delay"