am 2b3970a2: Merge change Idc1396c8 into eclair

Merge commit '2b3970a2956152a508254aa2675b68df363d46c1' into eclair-plus-aosp

* commit '2b3970a2956152a508254aa2675b68df363d46c1':
  Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.