Merge remote-tracking branch 'origin/MC-15974' into borg-security-2.3

Author: nathanjosiah

app/code/Magento/Checkout/view/frontend/web/js/action/select-payment-method.js

@@ -12,6 +12,10 @@ define([
     'use strict';
 
     return function (paymentMethod) {
+        paymentMethod.__disableTmpl = {
+            title: true
+        };
+
         quote.paymentMethod(paymentMethod);
     };
 });

app/code/Magento/Payment/Ui/Component/Listing/Column/Method/Options.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 namespace Magento\Payment\Ui\Component\Listing\Column\Method;
 
 /**
@@ -41,6 +42,14 @@ public function toOptionArray()
         if ($this->options === null) {
             $this->options = $this->paymentHelper->getPaymentMethodList(true, true);
         }
+
+        array_walk(
+            $this->options,
+            function (&$item) {
+                $item['__disableTmpl'] = true;
+            }
+        );
+
         return $this->options;
     }
 }

app/code/Magento/Ui/view/base/web/js/grid/filters/filters.js

@@ -274,7 +274,8 @@ define([
             filter = utils.extend({}, filters.base, filter);
             //Accepting labels as is.
             filter.__disableTmpl = {
-                label: 1
+                label: 1,
+                options: 1
             };
 
             filter = utils.template(filter, {