Fix up waypoint handling to not flicker on current WP change state