Merge change 8111 into donut

* changes:
  Don't start search from a dialog if there is no activity associated with the search manager at that point.