Texas Democrats return as redistricting standoff ends