Merge remote-tracking branch 'origin/master' into feature/filter-bindings

packages/client/src/components/ClientApp.svelte

@@ -119,14 +119,15 @@
   {/if}
 </svelte:head>
 
-<div
+{#if dataLoaded}
+  <div
     id="spectrum-root"
     lang="en"
     dir="ltr"
     class="spectrum spectrum--medium {$themeStore.baseTheme} {$themeStore.theme}"
     class:builder={$builderStore.inBuilder}
     class:show={fontsLoaded && dataLoaded}
->
+  >
     {#if $environmentStore.maintenance.length > 0}
       <MaintenanceScreen maintenanceList={$environmentStore.maintenance} />
     {:else}
@@ -251,8 +252,9 @@
         </UserBindingsProvider>
       </DeviceBindingsProvider>
     {/if}
-</div>
-<KeyboardManager />
+  </div>
+  <KeyboardManager />
+{/if}
 
 <style>
   #spectrum-root {