Merge from vscode 1eb87b0e9ce9886afeaecec22b31abd0d9b7939f (#7282)

* Merge from vscode 1eb87b0e9ce9886afeaecec22b31abd0d9b7939f

* fix various icon issues

* fix preview features

remote/package.json

@@ -4,6 +4,7 @@
   "dependencies": {
     "@microsoft/applicationinsights-web": "^2.1.1",
     "applicationinsights": "1.0.8",
+    "chokidar": "3.1.0",
     "cookie": "^0.4.0",
     "graceful-fs": "4.1.11",
     "http-proxy-agent": "^2.1.0",
@@ -16,7 +17,6 @@
     "onigasm-umd": "^2.2.2",
     "semver-umd": "^5.5.3",
     "spdlog": "^0.9.0",
-    "vscode-chokidar": "2.1.7",
     "vscode-minimist": "^1.2.1",
     "vscode-proxy-agent": "0.4.0",
     "vscode-ripgrep": "^1.5.7",