Merge remote-tracking branch 'origin/MC-41525' into 2.4-develop-pr57

Author: Serhii Balko

app/code/Magento/Payment/Helper/Data.php

@@ -200,7 +200,7 @@ public function getInfoBlock(InfoInterface $info, LayoutInterface $layout = null
      */
     public function getInfoBlockHtml(InfoInterface $info, $storeId)
     {
-        $this->_appEmulation->startEnvironmentEmulation($storeId);
+        $this->_appEmulation->startEnvironmentEmulation($storeId, \Magento\Framework\App\Area::AREA_FRONTEND, true);
 
         try {
             // Retrieve specified view block from appropriate design package (depends on emulated store)

app/code/Magento/Payment/Test/Unit/Helper/DataTest.php

@@ -234,7 +234,9 @@ public function testGetInfoBlockHtml()
             ->setMethods(['setArea', 'setIsSecureMode', 'getMethod', 'setStore', 'toHtml', 'setInfo'])
             ->getMockForAbstractClass();
 
-        $this->appEmulation->expects($this->once())->method('startEnvironmentEmulation')->with($storeId);
+        $this->appEmulation->expects($this->once())
+            ->method('startEnvironmentEmulation')
+            ->with($storeId, \Magento\Framework\App\Area::AREA_FRONTEND, true);
         $infoMock->expects($this->once())->method('getMethodInstance')->willReturn($methodMock);
         $methodMock->expects($this->once())->method('getInfoBlockType')->willReturn($blockType);
         $this->layoutMock->expects($this->once())->method('createBlock')