servo: Merge #20006 - Try to reduce instances of intermittent failures in wpt sync...