Merge change 23979 into eclair

* changes:
  Do a better job at finding the activity associated with a dialog when triggering search.