Merge proposals dependent on lp://staging/~thomas-voss/location-service/iterate-on-better-position-selection

1. iterate-on-better-position-selection
2. Dependent merge proposals