Merge "Fix for NPE in webview test" into main