Merge "Disable WebViewSetting for non-admin users." into nyc-dev