Merge change 3145 into donut

* changes:
  Add INTENT_ACTION_WEB_SEARCH_SETTINGS (thereby fixing the build too :)).