MC-14937: Complete Page Builder Analytics data collection

- Revert gift message changes

Author: davemacaulay

app/code/Magento/GiftMessage/etc/di.xml

@@ -13,13 +13,6 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\GiftMessage\Model\CompositeConfigProvider">
-        <arguments>
-            <argument name="configProviders" xsi:type="array">
-                <item name="gift_message_config_provider" xsi:type="object">Magento\GiftMessage\Model\GiftMessageConfigProvider</item>
-            </argument>
-        </arguments>
-    </type>
     <preference for="Magento\GiftMessage\Api\CartRepositoryInterface" type="Magento\GiftMessage\Model\CartRepository"/>
     <preference for="Magento\GiftMessage\Api\ItemRepositoryInterface" type="Magento\GiftMessage\Model\ItemRepository"/>
     <preference for="Magento\GiftMessage\Api\GuestCartRepositoryInterface" type="Magento\GiftMessage\Model\GuestCartRepository"/>

app/code/Magento/GiftMessage/etc/frontend/di.xml

@@ -29,6 +29,13 @@
     <type name="Magento\Multishipping\Model\Checkout\Type\Multishipping">
         <plugin name="save_gift_messages" type="Magento\GiftMessage\Model\Type\Plugin\Multishipping"/>
     </type>
+    <type name="Magento\GiftMessage\Model\CompositeConfigProvider">
+        <arguments>
+            <argument name="configProviders" xsi:type="array">
+                <item name="gift_message_config_provider" xsi:type="object">Magento\GiftMessage\Model\GiftMessageConfigProvider</item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\GiftMessage\Block\Cart\Item\Renderer\Actions\GiftOptions">
         <arguments>
             <argument name="layoutProcessors" xsi:type="array">