use new picker during cherry-pick #517
Merged
background
wait
wait-all
cancel
Loading