Merge "Clean up rc_pick_q_and_bounds_two_pass()"