Merge "WebViewUpdateManager: handle devices without WebView properly." into main