Rely on lead_lag_incidence instead of kstate to identify states

(cherry picked from commit 17a58cce)