Merge change 4326 into donut

* changes:
  Don't get location in search dialog.