Merge "Change WebView Package selection logic and error reporting" into main