Merge change 9704 into donut

* changes:
  Close the search dialog before starting voice search in all cases, i.e., also when launching web search, not just when it's using the intent API.