Merge change Ic3aa7aa6 into eclair

* changes:
  Recreate search dialog view each time it's shown.