Merge "Take better control over Exceptions thrown in WebViewFactory."