am 764ce70f: Merge change 4198 into donut

Merge commit '764ce70faf500dbfde39619409682e9bbf6fb393'

* commit '764ce70faf500dbfde39619409682e9bbf6fb393':
  protect starting of search dialog behind 'dev.disablesearchdialog' system property.