Backport #33888 by @wxiaoguang Fix #33886 Restore the old logic from #16510, which was incorrectly removed by #33678 Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
pickTask