LocationSelector2 interim commit