Merge "Prevent crash in WebView when disabling the hw renderer Bug #6596807" into jb-dev