Merge #11068: qa: Move wait_until to util