Merge "Fix wait_until(infinity) for condition_variable" into main