National redistricting battle turns to statehouses and city councils