Cherry-pick 32521 and 32516 [lts 20] #11900

Job	Run time
build	4m 15s
analyze	5s
lint	2m 34s
build-e2e-windows-subset	4m 25s
test	11m 44s
e2e-package-managers (ubuntu-latest, 22, yarn, 0)	8m 5s
e2e-package-managers (ubuntu-latest, 22, yarn, 2)	7m 4s
e2e-package-managers (ubuntu-latest, 22, pnpm, 2)	5m 40s
e2e-package-managers (ubuntu-latest, 22, yarn, 1)	6m 13s
e2e-package-managers (ubuntu-latest, 22, pnpm, 0)	5m 49s
e2e-package-managers (ubuntu-latest, 22, pnpm, 1)	5m 8s
e2e (ubuntu-latest, 22, npm, 3)	8m 21s
e2e (ubuntu-latest, 22, esbuild, 2)	8m 34s
e2e (ubuntu-latest, 22, esbuild, 0)	9m 23s
e2e (ubuntu-latest, 22, npm, 4)	10m 36s
e2e (ubuntu-latest, 22, npm, 1)	9m 6s
e2e (ubuntu-latest, 22, esbuild, 3)	8m 55s
e2e (ubuntu-latest, 22, npm, 2)	10m 13s
e2e (ubuntu-latest, 22, esbuild, 1)	10m 1s
e2e (ubuntu-latest, 22, npm, 0)	10m 17s
e2e (ubuntu-latest, 22, esbuild, 5)	7m 2s
e2e (ubuntu-latest, 22, esbuild, 4)	6m 31s
e2e (ubuntu-latest, 22, npm, 5)	11m 49s
e2e-snapshots	0s
e2e-windows-subset	4m 8s
	2h 55m 58s

Provide feedback