Fix hold pickup location drop down to show preferred first
Merge branch 'june' into darkknight2