Merge "Remove WebView leak"