Merge change 4198 into donut

* changes:
  protect starting of search dialog behind 'dev.disablesearchdialog' system property.