Merge pull request #1692 from entireio/fix-investigate-picker-parallel-flake

main

Commit

Soph2mo ago

investigate: fix flaky picker tests racing on global override