Merge "Update WebView.addJavascriptInterface() to ignore null instances"