Merge remote-tracking branch 'upstream/dev' into Bootstrap

Oqtane.Client/Themes/Controls/Container/ModuleActions.razor

@@ -20,6 +20,7 @@
     protected override void OnParametersSet()
     {
         // trim PageState to mitigate page bloat caused by Blazor serializing/encrypting state when crossing render mode boundaries
+        // only include properties required by the ModuleActionsInteractive component
         _pageState = new PageState
         {
             Alias = PageState.Alias,

Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor

@@ -91,6 +91,7 @@
         }
 
         // trim PageState to mitigate page bloat caused by Blazor serializing/encrypting state when crossing render mode boundaries
+        // only include properties required by the ControlPanelInteractive component
         _pageState = new PageState
         {
             Alias = PageState.Alias,

Oqtane.Client/Themes/Controls/Theme/CookieConsent.razor

@@ -103,6 +103,9 @@
     {
         var cookieConsentSetting = SettingService.GetSetting(PageState.Site.Settings, "CookieConsent", string.Empty);
         _enabled = !string.IsNullOrEmpty(cookieConsentSetting);
+
+        if (!_enabled) return;
+
         _optout = cookieConsentSetting == "optout";
         _actioned = await CookieConsentService.IsActionedAsync();
 
@@ -164,4 +167,4 @@
             StateHasChanged();
         }
     }
-}
+}