am b91e2b02: Merge change 9073 into donut

Merge commit 'b91e2b0292f9f4f76175a18e6e3cf392f3967ae8'

* commit 'b91e2b0292f9f4f76175a18e6e3cf392f3967ae8':
  Special-case search within the browser to not show the app icon