Merge change 3041

* changes:
  Remove obsolete flags from WebViewCore and WebView