Merge remote-tracking branch 'origin/MC-33699-CE-1' into 2.4-develop-php74-pr38

Author: zakdma

app/code/Magento/Catalog/etc/events.xml

@@ -42,7 +42,6 @@
     </event>
     <event name="magento_catalog_api_data_categorytreeinterface_save_after">
         <observer name="legacy_categorytree_save_after" instance="Magento\Framework\EntityManager\Observer\AfterEntitySave" />
-        <observer name="invalidate_cache_on_categorytree_design_change" instance="Magento\Catalog\Observer\InvalidateCacheOnCategoryDesignChange" />
     </event>
     <event name="magento_catalog_api_data_categorytreeinterface_delete_before">
         <observer name="legacy_categorytree_delete_before" instance="Magento\Framework\EntityManager\Observer\BeforeEntityDelete" />

app/code/Magento/Customer/Ui/Component/Listing/Column/Confirmation.php

@@ -45,7 +45,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function prepareDataSource(array $dataSource)
     {
@@ -66,7 +66,7 @@ public function prepareDataSource(array $dataSource)
     private function getFieldLabel(array $item)
     {
         $isConfirmationRequired = $this->accountConfirmation->isConfirmationRequired(
-            $item['website_id'][0],
+            $item['website_id'][0] ?? null,
             $item[$item['id_field_name']],
             $item['email']
         );

app/code/Magento/User/Observer/Backend/AuthObserver.php

@@ -21,6 +21,7 @@
 /**
  * User backend observer model for authentication
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class AuthObserver implements ObserverInterface
 {
@@ -184,6 +185,7 @@ private function _updateLockingInformation($user)
 
     /**
      * Check whether the latest password is expired
+     *
      * Side-effect can be when passwords were changed with different lifetime configuration settings
      *
      * @param array $latestPassword