Merge "Add API for FLAG_SKIP_PROBING" into main