Merge "Clean up WebViewFactory.getProvider error handling."