diff --git a/extensions/terminal-suggest/.vscodeignore b/extensions/terminal-suggest/.vscodeignore
index f05a79416be02..7251a128a0386 100644
--- a/extensions/terminal-suggest/.vscodeignore
+++ b/extensions/terminal-suggest/.vscodeignore
@@ -2,6 +2,4 @@ src/**
 out/**
 tsconfig.json
 .vscode/**
-extension.webpack.config.js
-extension-browser.webpack.config.js
 package-lock.json
diff --git a/extensions/terminal-suggest/extension-browser.webpack.config.js b/extensions/terminal-suggest/extension-browser.webpack.config.js
deleted file mode 100644
index 4b7c7460ff08a..0000000000000
--- a/extensions/terminal-suggest/extension-browser.webpack.config.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-//@ts-check
-
-'use strict';
-
-const withBrowserDefaults = require('../shared.webpack.config').browser;
-
-module.exports = withBrowserDefaults({
-	context: __dirname,
-	entry: {
-		extension: './src/terminalSuggestMain.ts'
-	},
-	output: {
-		filename: 'terminalSuggestMain.js'
-	},
-	resolve: {
-		fallback: {
-			'child_process': false
-		}
-	}
-});
diff --git a/extensions/terminal-suggest/extension.webpack.config.js b/extensions/terminal-suggest/extension.webpack.config.js
deleted file mode 100644
index 89f3ea28d8747..0000000000000
--- a/extensions/terminal-suggest/extension.webpack.config.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-//@ts-check
-'use strict';
-
-const withDefaults = require('../shared.webpack.config');
-
-module.exports = withDefaults({
-	context: __dirname,
-	entry: {
-		extension: './src/terminalSuggestMain.ts'
-	},
-	output: {
-		filename: 'terminalSuggestMain.js'
-	},
-	resolve: {
-		mainFields: ['module', 'main'],
-		extensions: ['.ts', '.js'] // support ts-files and js-files
-	}
-});
diff --git a/extensions/terminal-suggest/package.json b/extensions/terminal-suggest/package.json
index 82e488dd9f527..bcf53c171c50d 100644
--- a/extensions/terminal-suggest/package.json
+++ b/extensions/terminal-suggest/package.json
@@ -22,7 +22,6 @@
     "compile": "npx gulp compile-extension:terminal-suggest",
     "watch": "npx gulp watch-extension:terminal-suggest"
   },
-
   "main": "./out/terminalSuggestMain",
   "activationEvents": [
     "onTerminalCompletionsRequested"
@@ -30,5 +29,8 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/microsoft/vscode.git"
-  }
+  },
+  "extensionKind": [
+    "workspace"
+  ]
 }
diff --git a/src/vs/workbench/contrib/preferences/common/preferences.ts b/src/vs/workbench/contrib/preferences/common/preferences.ts
index b681d7d6787d9..10244f4354b32 100644
--- a/src/vs/workbench/contrib/preferences/common/preferences.ts
+++ b/src/vs/workbench/contrib/preferences/common/preferences.ts
@@ -176,5 +176,5 @@ export function compareTwoNullableNumbers(a: number | undefined, b: number | und
 	}
 }
 
-export const PREVIEW_INDICATOR_DESCRIPTION = localize('previewIndicatorDescription', "This setting controls a new feature that is still under refinement yet ready to use. Feedback is welcome.");
-export const EXPERIMENTAL_INDICATOR_DESCRIPTION = localize('experimentalIndicatorDescription', "This setting controls a new feature that is actively being developed and may be unstable. It is subject to change or removal.");
+export const PREVIEW_INDICATOR_DESCRIPTION = localize('previewIndicatorDescription', "Preview setting: this setting controls a new feature that is still under refinement yet ready to use. Feedback is welcome.");
+export const EXPERIMENTAL_INDICATOR_DESCRIPTION = localize('experimentalIndicatorDescription', "Experimental setting: this setting controls a new feature that is actively being developed and may be unstable. It is subject to change or removal.");
diff --git a/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts b/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts
index 808e68a6ca9a4..21417a0ea2e05 100644
--- a/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts
+++ b/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts
@@ -709,10 +709,16 @@ class TestResultsPeek extends PeekViewWidget {
 			return defaultMaxHeight;
 		}
 
+		if (this.testingPeek.historyVisible.value) { // don't cap height with the history split
+			return defaultMaxHeight;
+		}
+
 		const lineHeight = this.editor.getOption(EditorOption.lineHeight);
 		// 41 is experimentally determined to be the overhead of the peek view itself
 		// to avoid showing scrollbars by default in its content.
-		return Math.min(defaultMaxHeight || Infinity, (contentHeight + 41) / lineHeight);
+		const basePeekOverhead = 41;
+
+		return Math.min(defaultMaxHeight || Infinity, (contentHeight + basePeekOverhead) / lineHeight + 1);
 	}
 
 	private applyTheme() {