MC-32014: Remove google-shopping-ads module from core in 2.4.1

Author: krissyhiserote

lib/internal/Magento/Framework/Mview/View/Collection.php

@@ -93,7 +93,11 @@ private function getOrderedViewIds()
         /** @var IndexerInterface $indexer */
         foreach (array_keys($this->indexerConfig->getIndexers()) as $indexerId) {
             $indexer = $this->_entityFactory->create(IndexerInterface::class);
-            $orderedViewIds[] = $indexer->load($indexerId)->getViewId();
+            $viewId = $indexer->load($indexerId)->getViewId();
+            $view = $this->config->getView($viewId);
+            if (!empty($view) && !empty($view['view_id']) && $view['view_id'] === $viewId) {
+                $orderedViewIds[] = $viewId;
+            }
         }
         $orderedViewIds = array_filter($orderedViewIds);
         $orderedViewIds += array_diff(array_keys($this->config->getViews()), $orderedViewIds);

setup/src/Magento/Setup/Model/Installer.php

@@ -1660,5 +1660,6 @@ private function updateColumnType(
     public function removeUnusedTriggers(): void
     {
         $this->triggerCleaner->unsubscribe();
+        $this->cleanCaches();
     }
 }