Merge change Idc1396c8 into eclair

* changes:
  Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.