Merge change 4105 into donut

* changes:
  Honor the system setting of whether to show web suggestions.