Added on-demand preemption of navigation and charging state machines