Merge "Fix use of WebView.loadData() to avoid passing invalid encoding"