Merge change 6602 into donut

* changes:
  Guard against a searchable being null, which it shouldn't be, but we don't want to crash on an NPE if it is. Previously Searchables was capable of accidentally populating a null searchable in the list of searchables for web search which was causing an NPE here. The fix for that is in change 6600.