ACP2E-3646: Addresses selection is not saved when we "Check Out with Multiple Addresses"

Author: aplapana

app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php

@@ -299,7 +299,7 @@ protected function _init()
             $addresses = $quote->getAllAddresses();
             $defaultShippingId = null;
             foreach ($addresses as $address) {
-                if ($address->getAllItems()) {
+                if ($address->getAllItems() && !$defaultShippingId) {
                     $defaultShippingId = $address->getCustomerAddressId();
                 }
                 $quote->removeAddress($address->getId());

app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontProcessMultishippingCheckoutWhenCartPageIsOpenedInAnotherTabTest.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+/**
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -88,7 +88,7 @@
         <switchToNextTab stepKey="switchToNextTab"/>
         <!-- Click 'Continue to Billing Information' and 'Go to Review Your Order' -->
         <actionGroup ref="StorefrontGoToBillingInformationActionGroup" stepKey="redirectToSelectAddressAfterReset"/>
-        <seeOptionIsSelected selector="{{StorefrontCheckoutShippingMultipleAddressesSection.selectedMultipleShippingAddress('1')}}" userInput="{{US_Address_NY.street[1]}}" stepKey="checkAddressIsReset"/>
+        <seeOptionIsSelected selector="{{StorefrontCheckoutShippingMultipleAddressesSection.selectedMultipleShippingAddress('1')}}" userInput="{{UK_Not_Default_Address.street[0]}}" stepKey="checkAddressIsReset"/>
         <actionGroup ref="StorefrontCheckoutShippingSelectMultipleAddressesActionGroup" stepKey="selectMultipleAddressesAfterReset">
             <argument name="firstAddress" value="{{UK_Not_Default_Address.street[0]}}"/>
             <argument name="secondAddress" value="{{US_Address_NY.street[1]}}"/>

app/code/Magento/Multishipping/Test/Unit/Model/Cart/MultishippingClearItemAddressTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2016 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);