Merge branch 'main' into large-jaguar

Author: eleanorjboyd

package.json

@@ -456,7 +456,7 @@
                     "uniqueItems": true
                 },
                 "python.createEnvironment.contentButton": {
-                    "default": "show",
+                    "default": "hide",
                     "markdownDescription": "%python.createEnvironment.contentButton.description%",
                     "scope": "machine-overridable",
                     "type": "string",
@@ -466,7 +466,7 @@
                     ]
                 },
                 "python.createEnvironment.trigger": {
-                    "default": "off",
+                    "default": "prompt",
                     "markdownDescription": "%python.createEnvironment.trigger.description%",
                     "scope": "machine-overridable",
                     "type": "string",
@@ -1643,4 +1643,4 @@
         "worker-loader": "^3.0.8",
         "yargs": "^15.3.1"
     }
-}
+}