Merge change 8836 into donut

* changes:
  Add menu with search settings to search dialog.