am 2f1b422d: Merge change 3249 into donut

Merge commit '2f1b422dc8d30da19dfc51911261d92ccccd9edd'

* commit '2f1b422dc8d30da19dfc51911261d92ccccd9edd':
  Add new SHOW_WEB_SUGGESTIONS system setting, referenced by the search settings