Merge pull request #14953 from abpframework/auto-merge/rel-6-0/1528

Merge branch rel-7.0 with rel-6.0

npm/ng-packs/packages/core/src/lib/services/session-state.service.ts

@@ -31,7 +31,7 @@ export class SessionStateService {
   }
 
   private setInitialLanguage() {
-    if (this.getLanguage()) return;
+    const appLanguage = this.getLanguage();
 
     this.configState
       .getDeep$('localization.currentCulture.cultureName')
@@ -43,8 +43,9 @@ export class SessionStateService {
         if (lang.includes(';')) {
           lang = lang.split(';')[0];
         }
-
-        this.setLanguage(lang);
+        if (appLanguage !== lang) {
+          this.setLanguage(lang);
+        }
       });
   }