Merge "Fix WebViewFragment to avoid detroying the WebView too early"