Merge remote-tracking branch 'main/develop' into develop

Conflicts:
	dev/tests/unit/testsuite/Magento/Framework/App/FactoryStub.php
	dev/tests/unit/testsuite/Magento/Framework/App/ObjectManager/Environment/CompiledTest.php
	dev/tests/unit/testsuite/Magento/Framework/App/ObjectManager/Environment/CompiledTesting.php
	dev/tests/unit/testsuite/Magento/Framework/App/ObjectManager/Environment/ConfigTesting.php
	dev/tests/unit/testsuite/Magento/Framework/App/ObjectManager/Environment/DeveloperTest.php
	dev/tests/unit/testsuite/Magento/Framework/Css/PreProcessor/LessTest.php
	dev/tests/unit/testsuite/Magento/Framework/Less/FileGeneratorTest.php
	dev/tests/unit/testsuite/Magento/Framework/View/Asset/PreProcessor/ChainTest.php
	dev/tests/unit/testsuite/Magento/Framework/View/Asset/SourceTest.php
	dev/tests/unit/testsuite/Magento/Framework/View/Page/Config/RendererTest.php
	dev/tests/unit/testsuite/Magento/Tools/Di/App/CompilerTest.php
	dev/tests/unit/testsuite/Magento/Tools/Di/App/Task/OperationFactoryTest.php
	dev/tests/unit/testsuite/Magento/Tools/Di/Code/Generator/InterceptionConfigurationBuilderTest.php
	dev/tests/unit/testsuite/Magento/Tools/Di/Compiler/Config/Chain/PreferencesResolvingTest.php
	dev/tools/grunt/configs/less.js
	dev/tools/grunt/configs/themes.js
	dev/tools/grunt/configs/watch.json
	lib/internal/Magento/Framework/Api/Builder.php
	lib/internal/Magento/Framework/ObjectManager/Factory/Compiled.php