Merge "WebView part of fix for bug 5307956"