am 7e71fb28: Merge change 8111 into donut

Merge commit '7e71fb284d5997bff7e359edc8e1b19cbfb1c9ca'

* commit '7e71fb284d5997bff7e359edc8e1b19cbfb1c9ca':
  Don't start search from a dialog if there is no activity associated with