Merge change 4117 into donut

* changes:
  Add a Gservices setting to have a "use location for better search".