am 761f7934: am dd03c613: resolved conflicts for merge of 081a136d to eclair

Merge commit '761f79349a6019dc9f2322c3bbc66e0fa8e3b6c8'

* commit '761f79349a6019dc9f2322c3bbc66e0fa8e3b6c8':
  Remove third party support for Quick Search Box (aka global search).