Merge branch 'ACQE-7648' into ACQE-functional-deployment-v7

Author: Karishmathakare19

app/code/Magento/GiftMessage/Test/Mftf/Test/StorefrontGiftMessageForOrderOnCheckoutCartPageTest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2021 Adobe
+  * All Rights Reserved.
   */
 -->
 
@@ -17,6 +17,7 @@
             <group value="pr_exclude"/>
         </annotations>
         <before>
+            <magentoCLI command="config:set sales/gift_options/allow_items 0" stepKey="disableGiftMessagesForOrderItems"/>
             <magentoCLI command="config:set sales/gift_options/allow_order 1" stepKey="enableGiftMessageForOrder"/>
             <createData entity="SimpleProduct2" stepKey="simpleProduct"/>
         </before>