Merge change I29232f2a into eclair

* changes:
  Only dismiss search dialog after launching intent.