Merge "Attempt to repair the WebView pacakge in more cases" into main