Merge branch 'MC-30537' into MC-30537-1.0.0

Author: nathanjosiah

TwoFactorAuth/Test/Unit/Model/Config/Backend/ForceProvidersTest.php

@@ -1,7 +1,5 @@
 <?php
 /**
- * Compiler test. Check compilation of DI definitions and code generation
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */

TwoFactorAuth/view/adminhtml/templates/tfa/provider/configure.phtml

@@ -11,7 +11,7 @@
 <script type="text/x-magento-init">
 {
  "#tfa-configure-container": {
- "Magento_Ui/js/core/app": <?= /* @escapeNotVerified */ $block->getJsLayout() ?>
+ "Magento_Ui/js/core/app": <?= /* @noEscape */ $block->getJsLayout() ?>
  }
 }
 </script>