Merge "Workaround for bug 6609605: Hindi rendering regression in WebView" into jb-dev