Merge branch 'fix-ngonchanges-not-working-for-themed-components_contr…

…ibute-7.2' into fix-ngonchanges-not-working-for-themed-components_contribute-7.4

# Conflicts:
#	src/app/app.component.ts

src/app/shared/theme-support/theme.service.ts

@@ -240,14 +240,7 @@ export class ThemeService {
       if (hasValue(parentThemeName)) {
         // inherit the head tags of the parent theme
         return this.createHeadTags(parentThemeName);
-      }
-      const defaultThemeConfig = getDefaultThemeConfig();
-      const defaultThemeName = defaultThemeConfig.name;
-      if (
-        hasNoValue(defaultThemeName) ||
-        themeName === defaultThemeName ||
-        themeName === BASE_THEME_NAME
-      ) {
+      } else {
         // last resort, use fallback favicon.ico
         return [
           this.createHeadTag({
@@ -260,9 +253,6 @@ export class ThemeService {
           })
         ];
       }
-
-      // inherit the head tags of the default theme
-      return this.createHeadTags(defaultThemeName);
     }
 
     return headTagConfigs.map(this.createHeadTag.bind(this));