--- 2981326-23.patch	2020-07-22 17:33:37.000000000 +0530
+++ 2981326-25.patch	2020-07-22 17:33:04.000000000 +0530
@@ -1,5 +1,5 @@
 diff --git a/core/core.services.yml b/core/core.services.yml
-index c42ca2dd21..4432e9fcc0 100644
+index 3434104d3e..f92f41ea04 100644
 --- a/core/core.services.yml
 +++ b/core/core.services.yml
 @@ -445,6 +445,9 @@ services:
@@ -31,22 +31,21 @@
        - [setThemeRegistry, ['@theme.registry']]
    theme.initialization:
 diff --git a/core/lib/Drupal/Core/Extension/ModuleInstaller.php b/core/lib/Drupal/Core/Extension/ModuleInstaller.php
-index 3540a42ef0..1920eef720 100644
+index bc2f9d0323..cbb54b30ab 100644
 --- a/core/lib/Drupal/Core/Extension/ModuleInstaller.php
 +++ b/core/lib/Drupal/Core/Extension/ModuleInstaller.php
-@@ -7,6 +7,7 @@
- use Drupal\Core\DrupalKernelInterface;
- use Drupal\Core\Entity\EntityStorageException;
+@@ -9,6 +9,7 @@
  use Drupal\Core\Entity\FieldableEntityInterface;
-+use Psr\Log\LoggerInterface;
+ use Drupal\Core\Installer\InstallerKernel;
  use Drupal\Core\Serialization\Yaml;
++use Psr\Log\LoggerInterface;
  
  /**
-@@ -50,6 +51,14 @@ class ModuleInstaller implements ModuleInstallerInterface {
+  * Default implementation of the module installer.
+@@ -51,6 +52,13 @@ class ModuleInstaller implements ModuleInstallerInterface {
     */
    protected $uninstallValidators;
  
-+
 +  /**
 +   * The logger service.
 +   *
@@ -57,7 +56,7 @@
    /**
     * Constructs a new ModuleInstaller instance.
     *
-@@ -59,14 +68,21 @@ class ModuleInstaller implements ModuleInstallerInterface {
+@@ -60,14 +68,21 @@ class ModuleInstaller implements ModuleInstallerInterface {
     *   The module handler.
     * @param \Drupal\Core\DrupalKernelInterface $kernel
     *   The drupal kernel.
@@ -80,7 +79,7 @@
    }
  
    /**
-@@ -325,7 +341,7 @@ public function install(array $module_list, $enable_dependencies = TRUE) {
+@@ -328,7 +343,7 @@ public function install(array $module_list, $enable_dependencies = TRUE) {
          $this->moduleHandler->invoke($module, 'install', [$sync_status]);
  
          // Record the fact that it was installed.
@@ -89,7 +88,7 @@
        }
      }
  
-@@ -499,7 +515,7 @@ public function uninstall(array $module_list, $uninstall_dependents = TRUE) {
+@@ -504,7 +519,7 @@ public function uninstall(array $module_list, $uninstall_dependents = TRUE) {
        // @see https://www.drupal.org/node/2208429
        \Drupal::service('theme_handler')->refreshInfo();
  
@@ -99,17 +98,17 @@
        $schema_store = \Drupal::keyValue('system.schema');
        $schema_store->delete($module);
 diff --git a/core/lib/Drupal/Core/Theme/ThemeManager.php b/core/lib/Drupal/Core/Theme/ThemeManager.php
-index c6a0e2287d..a1d3168fdb 100644
+index c6a0e2287d..53c3ff176d 100644
 --- a/core/lib/Drupal/Core/Theme/ThemeManager.php
 +++ b/core/lib/Drupal/Core/Theme/ThemeManager.php
-@@ -3,6 +3,7 @@
- namespace Drupal\Core\Theme;
- 
- use Drupal\Component\Render\MarkupInterface;
-+use Psr\Log\LoggerInterface;
- use Drupal\Core\Render\Markup;
- use Drupal\Core\Routing\RouteMatchInterface;
+@@ -8,6 +8,7 @@
  use Drupal\Core\Routing\StackedRouteMatchInterface;
+ use Drupal\Core\Extension\ModuleHandlerInterface;
+ use Drupal\Core\Template\Attribute;
++use Psr\Log\LoggerInterface;
+ 
+ /**
+  * Provides the default implementation of a theme manager.
 @@ -56,6 +57,13 @@ class ThemeManager implements ThemeManagerInterface {
     */
    protected $root;