Merge "Fix WebView crashes"