Merge remote-tracking branch 'origin/2.4.0-develop' into MC-34941

Author: viktorpetryk

app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html

@@ -112,7 +112,7 @@
             </div>
         </div>
     </div>
-    <div class="message notice" if="message">
-        <div data-bind="text: message"></div>
+    <div class="message notice" if="$data.message">
+        <div data-bind="text: $data.message"></div>
     </div>
 </li>

dev/tests/integration/testsuite/Magento/Elasticsearch6/Controller/QuickSearchTest.php

@@ -64,6 +64,6 @@ public function testQuickSearchWithImprovedPriceRangeCalculation()
             $this->storeManager->setCurrentStore($defaultStore);
         }
 
-        $this->assertContains('search product 1', $responseBody);
+        $this->assertStringContainsString('search product 1', $responseBody);
     }
 }