Merge "job: make charging constraint update criteria customizable" into main