am 399c6b8e: am 552751ea: Avoid crash in browser in systems with no search provider

Merge commit '399c6b8ec5b4fda71bbf67edd7e9dcb7fb5b8f00'

* commit '399c6b8ec5b4fda71bbf67edd7e9dcb7fb5b8f00':
  Avoid crash in browser in systems with no search provider