[2.2] Update current theme after loadThemes call is done (#4685)

Fix order: Load themes before updating them. This allows non-public themes to be available as default themes.

contribs/gmf/src/controllers/abstract.js

@@ -147,11 +147,13 @@ gmf.AbstractController = function(config, $scope, $injector) {
     // Reload theme when login status changes.
     const previousThemeName = this.gmfThemeManager.getThemeName();
     this.gmfThemeManager.setThemeName('', true);
+
+    // Reload themes and background layer when login status changes.
+    this.gmfThemes_.loadThemes(roleId);
+
     if (evt.type !== gmf.AuthenticationEventType.READY) {
       this.updateCurrentTheme_(previousThemeName);
     }
-    // Reload themes and background layer when login status changes.
-    this.gmfThemes_.loadThemes(roleId);
     this.setDefaultBackground_(null);
     this.updateHasEditableLayers_();
   };