diff --git a/.github/workflows/build_whl.yml b/.github/workflows/build_whl.yml
index c0f40c96a26..c2073330d9d 100644
--- a/.github/workflows/build_whl.yml
+++ b/.github/workflows/build_whl.yml
@@ -33,7 +33,7 @@ jobs:
         apt-get -y -qq update
         apt-get install -y gettext sudo
     - name: Use Node.js
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: '16.x'
     - name: Install Yarn
diff --git a/.github/workflows/check_licenses.yml b/.github/workflows/check_licenses.yml
index 81b8cd33879..20dcdb0eaf2 100644
--- a/.github/workflows/check_licenses.yml
+++ b/.github/workflows/check_licenses.yml
@@ -31,7 +31,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Use Node.js
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: '16.x'
     - name: Cache Node.js modules
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index dd19a2eb2bc..574b33df16b 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -34,7 +34,7 @@ jobs:
       with:
         python-version: '3.11'
     - name: Use Node.js
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: '16.x'
     - name: Get yarn cache directory path
diff --git a/.github/workflows/yarn.yml b/.github/workflows/yarn.yml
index 657b6a52cba..20123f3823c 100644
--- a/.github/workflows/yarn.yml
+++ b/.github/workflows/yarn.yml
@@ -31,7 +31,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Use Node.js
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: '16.x'
     - name: Get yarn cache directory path
diff --git a/docker/base.dockerfile b/docker/base.dockerfile
index 8609a195245..61a2ca8ce89 100644
--- a/docker/base.dockerfile
+++ b/docker/base.dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:bionic
+FROM ubuntu:jammy
 
 ENV NODE_VERSION=16.20.0
 
@@ -11,9 +11,9 @@ RUN apt-get update && \
     git \
     git-lfs \
     psmisc \
-    python2.7 \
-    python-pip \
-    python-sphinx
+    python3 \
+    python3-pip \
+    python3-sphinx
 
 # add yarn ppa
 RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
@@ -21,19 +21,23 @@ RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources
 
 # install nodejs and yarn
 RUN apt-get update && \
-    curl -sSO https://deb.nodesource.com/node_16.x/pool/main/n/nodejs/nodejs_$NODE_VERSION-1nodesource1_amd64.deb && \
-    dpkg -i ./nodejs_$NODE_VERSION-1nodesource1_amd64.deb && \
-    rm nodejs_$NODE_VERSION-1nodesource1_amd64.deb && \
+    ARCH=$(dpkg --print-architecture) && \
+    curl -sSO https://deb.nodesource.com/node_16.x/pool/main/n/nodejs/nodejs_$NODE_VERSION-1nodesource1_$ARCH.deb && \
+    dpkg -i ./nodejs_$NODE_VERSION-1nodesource1_$ARCH.deb && \
+    rm nodejs_$NODE_VERSION-1nodesource1_$ARCH.deb && \
     apt-get install yarn
 
 RUN git lfs install
 
+# Check if symbolic links exist before creating them
+RUN if [ ! -f /usr/bin/python ]; then ln -s /usr/bin/python3 /usr/bin/python; fi \
+ && if [ ! -f /usr/bin/pip ]; then ln -s /usr/bin/pip3 /usr/bin/pip; fi
+
 # copy Kolibri source code into image
 COPY . /kolibri
 
 # do the time-consuming base install commands
 RUN cd /kolibri \
-    && pip install -r requirements/dev.txt \
-    && pip install -r requirements/build.txt \
-    && pip install -r requirements/test.txt \
+    && pip3 install -r requirements/dev.txt \
+    && pip3 install -r requirements/test.txt \
     && yarn install --network-timeout 100000
diff --git a/docker/demoserver.dockerfile b/docker/demoserver.dockerfile
index 55547ee8aed..2bd8bee69b4 100644
--- a/docker/demoserver.dockerfile
+++ b/docker/demoserver.dockerfile
@@ -2,7 +2,6 @@ FROM learningequality/kolibribase
 
 ENV KOLIBRI_RUN_MODE=demoserver
 ENV KOLIBRI_PROVISIONDEVICE_FACILITY="Kolibri Demo"
-ENV WHICH_PYTHON=python2
 
 COPY docker/entrypoint.py /docker/entrypoint.py
 
diff --git a/docker/entrypoint.py b/docker/entrypoint.py
index d95d011bc8a..2a5e0a15669 100644
--- a/docker/entrypoint.py
+++ b/docker/entrypoint.py
@@ -38,7 +38,7 @@
 # - KOLIBRI_PROVISIONDEVICE_FACILITY  if set, provision facility with this name
 # - CHANNELS_TO_IMPORT if set, comma separated list of channel IDs to import
 DEFAULT_ENVS = {
-    "WHICH_PYTHON": "python2",  # or python3 if you prefer; Kolibri don't care
+    "WHICH_PYTHON": "python3",  # or python3 if you prefer; Kolibri don't care
     "KOLIBRI_HOME": "/kolibrihome",
     "KOLIBRI_HTTP_PORT": "8080",
     "KOLIBRI_LANG": "en",
diff --git a/integration_testing/scripts/run_kolibri_app_mode.py b/integration_testing/scripts/run_kolibri_app_mode.py
index 380118c8961..62efe008d14 100644
--- a/integration_testing/scripts/run_kolibri_app_mode.py
+++ b/integration_testing/scripts/run_kolibri_app_mode.py
@@ -21,10 +21,9 @@ def SERVING(self, port):
         self.port = port
 
     def RUN(self):
-        start_url = (
-            "http://127.0.0.1:{port}".format(port=self.port)
-            + interface.get_initialize_url()
-        )
+        start_url = "http://127.0.0.1:{port}".format(
+            port=self.port
+        ) + interface.get_initialize_url(auth_token="1234")
         print("Kolibri running at: {start_url}".format(start_url=start_url))
 
 
diff --git a/kolibri/core/assets/src/composables/useUserSyncStatus.js b/kolibri/core/assets/src/composables/useUserSyncStatus.js
index 4c1213f7aba..503ad479c07 100644
--- a/kolibri/core/assets/src/composables/useUserSyncStatus.js
+++ b/kolibri/core/assets/src/composables/useUserSyncStatus.js
@@ -14,6 +14,7 @@ const deviceStatus = ref(null);
 const deviceStatusSentiment = ref(null);
 const hasDownloads = ref(false);
 const lastDownloadRemoved = ref(null);
+const syncDownloadsInProgress = ref(false);
 const timeoutInterval = computed(() => {
   return get(status) === SyncStatus.QUEUED ? 1000 : 10000;
 });
@@ -51,6 +52,7 @@ export function pollUserSyncStatusTask() {
       lastDownloadRemoved.value = syncData[0].last_download_removed
         ? new Date(syncData[0].last_download_removed)
         : null;
+      syncDownloadsInProgress.value = syncData[0].sync_downloads_in_progress;
     } else {
       status.value = SyncStatus.NOT_CONNECTED;
     }
@@ -83,5 +85,6 @@ export default function useUserSyncStatus() {
     deviceStatusSentiment,
     hasDownloads,
     lastDownloadRemoved,
+    syncDownloadsInProgress,
   };
 }
diff --git a/kolibri/core/assets/src/core-app/apiSpec.js b/kolibri/core/assets/src/core-app/apiSpec.js
index 10b6b1ca069..8d64a667011 100644
--- a/kolibri/core/assets/src/core-app/apiSpec.js
+++ b/kolibri/core/assets/src/core-app/apiSpec.js
@@ -105,6 +105,7 @@ import * as sync from '../views/sync/syncComponentSet';
 import PageRoot from '../views/PageRoot';
 import NotificationsRoot from '../views/NotificationsRoot';
 import useMinimumKolibriVersion from '../composables/useMinimumKolibriVersion';
+import useUserSyncStatus from '../composables/useUserSyncStatus';
 import useUser from '../composables/useUser';
 
 // webpack optimization
@@ -232,6 +233,7 @@ export default {
       useKShow,
       useMinimumKolibriVersion,
       useUser,
+      useUserSyncStatus,
     },
   },
   resources,
diff --git a/kolibri/core/assets/src/utils/browserInfo.js b/kolibri/core/assets/src/utils/browserInfo.js
index 264c39e8d7c..412b0d92498 100644
--- a/kolibri/core/assets/src/utils/browserInfo.js
+++ b/kolibri/core/assets/src/utils/browserInfo.js
@@ -87,3 +87,9 @@ export const isMacWebView =
  * All web views
  */
 export const isEmbeddedWebView = isAndroidWebView || isMacWebView;
+
+// Check for presence of the touch event in DOM or multi-touch capabilities
+export const isTouchDevice =
+  'ontouchstart' in window ||
+  window.navigator?.maxTouchPoints > 0 ||
+  window.navigator?.msMaxTouchPoints > 0;
diff --git a/kolibri/core/assets/src/views/AppBar.vue b/kolibri/core/assets/src/views/AppBar.vue
index 7d256f8b2a2..6d5cabc27f9 100644
--- a/kolibri/core/assets/src/views/AppBar.vue
+++ b/kolibri/core/assets/src/views/AppBar.vue
@@ -10,7 +10,7 @@
 
       <UiToolbar
         :title="title"
-        :removeNavIcon="isAppContext && !windowIsLarge"
+        :removeNavIcon="isAppContext && isTouchDevice"
         type="clear"
         textColor="white"
         class="app-bar"
@@ -19,7 +19,7 @@
         :removeBrandDivider="true"
       >
         <template
-          v-if="windowIsLarge || !isAppContext"
+          v-if="windowIsLarge || !isAppContext || !isTouchDevice"
           #icon
         >
           <KIconButton
@@ -104,7 +104,7 @@
     <!-- Window size and app context. Changes may need to be made -->
     <!-- in parallel in both files for non-breaking updates -->
     <div
-      v-if="!windowIsLarge && !isAppContext"
+      v-if="!windowIsLarge && (!isAppContext || (isAppContext && !isTouchDevice))"
       class="subpage-nav"
     >
       <slot name="sub-nav"></slot>
@@ -121,6 +121,7 @@
   import UiToolbar from 'kolibri.coreVue.components.UiToolbar';
   import KIconButton from 'kolibri-design-system/lib/buttons-and-links/KIconButton';
   import themeConfig from 'kolibri.themeConfig';
+  import { isTouchDevice } from 'kolibri.utils.browserInfo';
   import useKResponsiveWindow from 'kolibri.coreVue.composables.useKResponsiveWindow';
   import navComponentsMixin from '../mixins/nav-components';
   import SkipNavigationLink from './SkipNavigationLink';
@@ -160,6 +161,9 @@
       usernameForDisplay() {
         return !hashedValuePattern.test(this.username) ? this.username : this.fullName;
       },
+      isTouchDevice() {
+        return isTouchDevice;
+      },
     },
     created() {
       if (this.isLearner) {
diff --git a/kolibri/core/assets/src/views/BottomNavigationBar.vue b/kolibri/core/assets/src/views/BottomNavigationBar.vue
index d3655279055..e32ae0dbcef 100644
--- a/kolibri/core/assets/src/views/BottomNavigationBar.vue
+++ b/kolibri/core/assets/src/views/BottomNavigationBar.vue
@@ -36,10 +36,17 @@
       <KIconButton
         icon="menu"
         :ariaLabel="coreString('menuLabel')"
+        size="small"
         :color="navShown ? $themeTokens.primary : $themeTokens.annotation"
         @click="$emit('toggleNav')"
       />
-      <p :style="{ color: $themeTokens.primary }">{{ coreString('menuLabel') }}</p>
+      <p
+        v-if="navShown"
+        class="nav-menu-label"
+        :style="{ color: $themeTokens.primary }"
+      >
+        {{ coreString('menuLabel') }}
+      </p>
     </span>
   </div>
 
diff --git a/kolibri/core/assets/src/views/SideNav.vue b/kolibri/core/assets/src/views/SideNav.vue
index 9a1feb5248a..7d91b9b01cc 100644
--- a/kolibri/core/assets/src/views/SideNav.vue
+++ b/kolibri/core/assets/src/views/SideNav.vue
@@ -173,7 +173,7 @@
             </div>
           </div>
           <div
-            v-if="!isAppContext || windowIsLarge"
+            v-if="!isAppContext || !isTouchDevice || windowIsLarge"
             class="side-nav-header"
             :style="{
               height: topBarHeight + 'px',
@@ -251,6 +251,7 @@
   import Backdrop from 'kolibri.coreVue.components.Backdrop';
   import LanguageSwitcherModal from 'kolibri.coreVue.components.LanguageSwitcherModal';
   import TotalPoints from 'kolibri.coreVue.components.TotalPoints';
+  import { isTouchDevice } from 'kolibri.utils.browserInfo';
   import navComponentsMixin from '../mixins/nav-components';
   import useUser from '../composables/useUser';
   import useUserSyncStatus from '../composables/useUserSyncStatus';
@@ -325,6 +326,9 @@
         username: state => state.core.session.username,
         fullName: state => state.core.session.full_name,
       }),
+      isTouchDevice() {
+        return isTouchDevice;
+      },
       width() {
         return this.showAppNavView ? '100vw' : `${this.topBarHeight * 4.5}px`;
       },
@@ -337,11 +341,11 @@
         //  Window size and app context. Changes may need to be made
         // in parallel in both files for non-breaking updates
         // The expected behavior is:
-        // In an app context, on small and medium screens,
-        // show the app Nav
+        // In an app context, on screens with touch capabilities,
+        // show the app Nav.
         // In browser based contexts, and large screen app view
         // use the "non-app" upper navigation bar
-        return this.isAppContext && !this.windowIsLarge;
+        return this.isAppContext && this.isTouchDevice;
       },
       footerMsg() {
         return this.$tr('poweredBy', { version: __version });
diff --git a/kolibri/core/assets/src/views/sortable/DragContainer.vue b/kolibri/core/assets/src/views/sortable/DragContainer.vue
index f577418e7ea..7fb1e54585c 100644
--- a/kolibri/core/assets/src/views/sortable/DragContainer.vue
+++ b/kolibri/core/assets/src/views/sortable/DragContainer.vue
@@ -115,12 +115,9 @@
   }
 
   @keyframes bounce-in {
-    from {
-      animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
-    }
-
     0% {
       transform: scale3d(1.05, 1.05, 1.05);
+      animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
     }
 
     50% {
@@ -128,7 +125,7 @@
       animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
     }
 
-    to {
+    100% {
       transform: scale3d(1, 1, 1);
       animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
     }
diff --git a/kolibri/core/assets/src/views/userAccounts/BirthYearSelect.vue b/kolibri/core/assets/src/views/userAccounts/BirthYearSelect.vue
index 6280f2c9f8c..f6db52e9f3e 100644
--- a/kolibri/core/assets/src/views/userAccounts/BirthYearSelect.vue
+++ b/kolibri/core/assets/src/views/userAccounts/BirthYearSelect.vue
@@ -85,8 +85,12 @@
     methods: {
       makeYearOptions(max, min) {
         return range(max, min, -1).map(n => {
+          // Because of timezone, year could be mismatched when localized in any
+          // timezone that less than UTC. for ex- 2022 will be shown instead of 2023
+          const date = new Date();
+          date.setFullYear(n);
           return {
-            label: this.$formatDate(String(n), { year: 'numeric' }),
+            label: this.$formatDate(String(date), { year: 'numeric' }),
             value: String(n),
           };
         });
diff --git a/kolibri/core/auth/migrations/0024_extend_username_length.py b/kolibri/core/auth/migrations/0024_extend_username_length.py
new file mode 100644
index 00000000000..86efcc629aa
--- /dev/null
+++ b/kolibri/core/auth/migrations/0024_extend_username_length.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.29 on 2023-10-17 17:51
+from __future__ import unicode_literals
+
+from django.db import migrations
+from django.db import models
+
+import kolibri.core.auth.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("kolibriauth", "0023_change_extra_fields_validator"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="facilityuser",
+            name="username",
+            field=models.CharField(
+                help_text="Required. 254 characters or fewer.",
+                max_length=254,
+                validators=[kolibri.core.auth.models.validate_username],
+                verbose_name="username",
+            ),
+        ),
+    ]
diff --git a/kolibri/core/auth/models.py b/kolibri/core/auth/models.py
index 442564bcd13..21554ae96eb 100644
--- a/kolibri/core/auth/models.py
+++ b/kolibri/core/auth/models.py
@@ -66,6 +66,7 @@
 from .permissions.general import IsAdminForOwnFacility
 from .permissions.general import IsOwn
 from .permissions.general import IsSelf
+from kolibri.core import error_constants
 from kolibri.core.auth.constants.demographics import choices as GENDER_CHOICES
 from kolibri.core.auth.constants.demographics import DEFERRED
 from kolibri.core.auth.constants.demographics import NOT_SPECIFIED
@@ -344,6 +345,27 @@ def infer_dataset(self, *args, **kwargs):
         )
 
 
+validate_username_allowed_chars = validators.RegexValidator(
+    r'[\s`~!@#$%^&*()\-+={}\[\]\|\\\/:;"\'<>,\.\?]',
+    "Enter a valid username. This value can contain only letters, numbers, and underscores.",
+    code=error_constants.INVALID,
+    inverse_match=True,
+)
+
+validate_username_max_length = validators.MaxLengthValidator(
+    30, "Required. 30 characters or fewer. Letters and digits only"
+)
+
+
+def validate_username(value):
+    try:
+        validators.validate_email(value)
+    except ValidationError:
+        # for kolibri backwards compatibility, if the username is not an email:
+        validate_username_allowed_chars(value)
+        validate_username_max_length(value)
+
+
 class KolibriAbstractBaseUser(AbstractBaseUser):
     """
     Our custom user type, derived from ``AbstractBaseUser`` as described in the Django docs.
@@ -360,15 +382,9 @@ class Meta:
 
     username = models.CharField(
         "username",
-        max_length=30,
-        help_text="Required. 30 characters or fewer. Letters and digits only",
-        validators=[
-            validators.RegexValidator(
-                r'[\s`~!@#$%^&*()\-+={}\[\]\|\\\/:;"\'<>,\.\?]',
-                "Enter a valid username. This value can contain only letters, numbers, and underscores.",
-                inverse_match=True,
-            )
-        ],
+        max_length=254,
+        help_text="Required. 254 characters or fewer.",
+        validators=[validate_username],
     )
     full_name = models.CharField("full name", max_length=120, blank=True)
     date_joined = DateTimeTzField("date joined", default=local_now, editable=False)
diff --git a/kolibri/core/auth/serializers.py b/kolibri/core/auth/serializers.py
index 4c9f8fd72bc..6bc8c9fbc26 100644
--- a/kolibri/core/auth/serializers.py
+++ b/kolibri/core/auth/serializers.py
@@ -2,6 +2,7 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
+from django.core.exceptions import ValidationError as DjangoValidationError
 from django.core.validators import MinLengthValidator
 from rest_framework import serializers
 from rest_framework.validators import UniqueTogetherValidator
@@ -16,6 +17,8 @@
 from .models import LearnerGroup
 from .models import Membership
 from .models import Role
+from .models import validate_username_allowed_chars
+from .models import validate_username_max_length
 from kolibri.core import error_constants
 from kolibri.core.auth.constants.demographics import NOT_SPECIFIED
 
@@ -62,7 +65,21 @@ def save(self, **kwargs):
         return instance
 
     def validate(self, attrs):
-        username = attrs.get("username")
+        username = attrs.get("username", None)
+        if username is not None:
+            # in case a patch request does not provide username attribute
+            try:
+                validate_username_allowed_chars(username)
+            except DjangoValidationError as e:
+                raise serializers.ValidationError({"username": e.message})
+
+            try:
+                validate_username_max_length(username)
+            except DjangoValidationError as e:
+                raise serializers.ValidationError(
+                    {"username": e.message}, code=error_constants.MAX_LENGTH
+                )
+
         # first condition is for creating object, second is for updating
         facility = attrs.get("facility") or getattr(self.instance, "facility")
         if (
diff --git a/kolibri/core/auth/test/test_api.py b/kolibri/core/auth/test/test_api.py
index 27edca3e31e..3932ef058e8 100644
--- a/kolibri/core/auth/test/test_api.py
+++ b/kolibri/core/auth/test/test_api.py
@@ -751,6 +751,32 @@ def test_creating_user_same_username_case_insensitive(self):
             response.data[0]["id"], error_constants.USERNAME_ALREADY_EXISTS
         )
 
+    def test_do_not_allow_emails_in_usernames(self):
+        data = {
+            "username": "bob@learningequality.org",
+            "password": DUMMY_PASSWORD,
+            "facility": self.facility.id,
+        }
+        response = self.client.post(
+            reverse("kolibri:core:facilityuser-list"), data, format="json"
+        )
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+        self.assertEqual(response.data[0]["id"], error_constants.INVALID)
+        self.assertEqual(response.data[0]["metadata"]["field"], "username")
+
+    def test_max_length_username_in_api(self):
+        data = {
+            "username": 32 * "gh",
+            "password": DUMMY_PASSWORD,
+            "facility": self.facility.id,
+        }
+        response = self.client.post(
+            reverse("kolibri:core:facilityuser-list"), data, format="json"
+        )
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+        self.assertEqual(response.data[0]["id"], error_constants.MAX_LENGTH)
+        self.assertEqual(response.data[0]["metadata"]["field"], "username")
+
 
 class UserUpdateTestCase(APITestCase):
     @classmethod
diff --git a/kolibri/core/auth/test/test_models.py b/kolibri/core/auth/test/test_models.py
index 5991f13032f..549a691b54d 100644
--- a/kolibri/core/auth/test/test_models.py
+++ b/kolibri/core/auth/test/test_models.py
@@ -680,6 +680,26 @@ def test_deserialize_empty_password(self):
         self.assertEqual("bob", user.username)
         self.assertEqual(NOT_SPECIFIED, user.password)
 
+    def test_username_validation(self):
+        self.facility = Facility.objects.create()
+        self.device_settings = DeviceSettings.objects.create()
+        user1 = FacilityUser.objects.create(
+            username="bob@learningequality.org",
+            password="password",
+            facility=self.facility,
+        )
+        user1.full_clean()
+        user2 = FacilityUser.objects.create(
+            username="@bob", password="password", facility=self.facility
+        )
+        with self.assertRaises(ValidationError):
+            user2.full_clean()
+        user3 = FacilityUser.objects.create(
+            username=32 * "gh", password="password", facility=self.facility
+        )
+        with self.assertRaises(ValidationError):
+            user3.full_clean()
+
 
 class CollectionHierarchyTestCase(TestCase):
     def test_facility_with_parent(self):
diff --git a/kolibri/core/auth/test/test_morango_integration.py b/kolibri/core/auth/test/test_morango_integration.py
index 438d79c96e8..bd11d209758 100644
--- a/kolibri/core/auth/test/test_morango_integration.py
+++ b/kolibri/core/auth/test/test_morango_integration.py
@@ -383,6 +383,7 @@ def test_scenarios(self, servers):
         s1.create_model(Role, collection_id=fac.id, user_id=alk_user.id, kind="admin")
         s0.create_model(Role, collection_id=fac.id, user_id=alk_user.id, kind="admin")
         s1.sync(s0, facility)
+        s2.sync(s0, facility)
         role = Role.objects.using(s1.db_alias).get(user=alk_user)
         admin_role = Store.objects.using(s1.db_alias).get(id=role.id)
         self.assertTrue(admin_role.conflicting_serialized_data)
@@ -397,6 +398,41 @@ def test_scenarios(self, servers):
         )
         self.assertTrue(Store.objects.using(s1.db_alias).get(id=alk_user.id).deleted)
 
+        # assert deleted object is transitively propagated
+        s2.sync(s1, facility)
+        self.assertFalse(
+            FacilityUser.objects.using(s2.db_alias)
+            .filter(username="Antemblowind")
+            .exists()
+        )
+        self.assertTrue(Store.objects.using(s2.db_alias).get(id=alk_user.id).deleted)
+
+        # assert deletion takes priority over update
+        alk_user = FacilityUser.objects.using(s0.db_alias).create(
+            username="Antemblowind", facility=facility
+        )
+        # Sync to both devices
+        s1.sync(s0, facility)
+        s2.sync(s0, facility)
+
+        # delete on s0
+        s0.delete_model(FacilityUser, id=alk_user.id)
+        # update on s1
+        s1.update_model(FacilityUser, alk_user.id, username="Antemblowind2")
+        # Sync deletion to s2
+        s2.sync(s0, facility)
+        self.assertFalse(
+            FacilityUser.objects.using(s2.db_alias).filter(id=alk_user.id).exists()
+        )
+        # Sync update to s2
+        s2.sync(s1, facility)
+        self.assertFalse(
+            FacilityUser.objects.using(s2.db_alias).filter(id=alk_user.id).exists()
+        )
+        self.assertFalse(
+            FacilityUser.objects.using(s1.db_alias).filter(id=alk_user.id).exists()
+        )
+
         # # role deletion and re-creation
         # Change roles for users
         alto_user = FacilityUser.objects.using(s1.db_alias).get(
@@ -847,6 +883,22 @@ def test_single_user_assignment_sync(self, servers):
                 self.assert_existence(
                     self.tablet, kind, assignment_id, should_exist=False
                 )
+                if disable_assignment == self.deactivate:
+                    # If we're deactivating the assignment, try reactivating it to check that we
+                    # can make it active again
+                    self.set_active_state(self.laptop_a, kind, assignment_id, True)
+                    self.sync_full_facility_servers()
+                    self.assert_existence(
+                        self.tablet, kind, assignment_id, should_exist=False
+                    )
+                    self.assert_existence(
+                        self.laptop_b, kind, assignment_id, should_exist=True
+                    )
+                    self.sync_single_user(self.laptop_a)
+                    # import IPython; IPython.embed()
+                    self.assert_existence(
+                        self.tablet, kind, assignment_id, should_exist=True
+                    )
 
         # Create exam on Laptop A, single-user sync to tablet, then modify exam on Laptop A and
         # single-user sync again to check that "updating" works
diff --git a/kolibri/core/content/api.py b/kolibri/core/content/api.py
index f99db211e2e..a5399d3076c 100644
--- a/kolibri/core/content/api.py
+++ b/kolibri/core/content/api.py
@@ -55,7 +55,7 @@
 from kolibri.core.content.models import ContentRequestReason
 from kolibri.core.content.models import ContentRequestStatus
 from kolibri.core.content.permissions import CanManageContent
-from kolibri.core.content.tasks import automatic_resource_import
+from kolibri.core.content.tasks import automatic_user_imported_resource_cleanup
 from kolibri.core.content.utils.content_types_tools import (
     renderable_contentnodes_q_filter,
 )
@@ -1329,9 +1329,19 @@ def consolidate(self, items, queryset):
         return sorted_items
 
 
+class ContentRequestFilter(FilterSet):
+    contentnode_id = UUIDFilter()
+    contentnode_id__in = UUIDInFilter(field_name="contentnode_id")
+
+    class Meta:
+        model = ContentDownloadRequest
+        fields = ("contentnode_id", "contentnode_id__in")
+
+
 class ContentRequestViewset(ReadOnlyValuesViewset, CreateModelMixin):
     serializer_class = serializers.ContentDownloadRequestSerializer
-
+    filter_backends = (DjangoFilterBackend,)
+    filter_class = ContentRequestFilter
     pagination_class = OptionalPageNumberPagination
 
     values = (
@@ -1358,6 +1368,7 @@ def annotate_queryset(self, queryset):
                     source_id=OuterRef("source_id"),
                     contentnode_id=OuterRef("contentnode_id"),
                     requested_at__gte=OuterRef("requested_at"),
+                    reason=OuterRef("reason"),
                 ).exclude(status=ContentRequestStatus.Failed)
             )
         ).filter(has_removal=False)
@@ -1400,7 +1411,7 @@ def delete(self, request, pk=None):
             content_request.contentnode_id = existing_download_request.contentnode_id
             content_request.save()
 
-        automatic_resource_import.enqueue_if_not()
+        automatic_user_imported_resource_cleanup.enqueue_if_not()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
diff --git a/kolibri/core/content/management/commands/deletecontent.py b/kolibri/core/content/management/commands/deletecontent.py
index 4143ad6289e..c2258b54ef8 100644
--- a/kolibri/core/content/management/commands/deletecontent.py
+++ b/kolibri/core/content/management/commands/deletecontent.py
@@ -11,6 +11,7 @@
 from kolibri.core.content.utils.annotation import propagate_forced_localfile_removal
 from kolibri.core.content.utils.annotation import reannotate_all_channels
 from kolibri.core.content.utils.annotation import set_content_invisible
+from kolibri.core.content.utils.content_request import propagate_contentnode_removal
 from kolibri.core.content.utils.importability_annotation import clear_channel_stats
 from kolibri.core.content.utils.paths import get_content_database_file_path
 from kolibri.core.tasks.management.commands.base import AsyncCommand
@@ -21,15 +22,20 @@
 
 
 def delete_metadata(
-    channel, node_ids, exclude_node_ids, force_delete, ignore_admin_flags
+    channel,
+    node_ids,
+    exclude_node_ids,
+    force_delete,
+    ignore_admin_flags,
+    update_content_requests,
 ):
     # Only delete all metadata if we are not doing selective deletion
     delete_all_metadata = not (node_ids or exclude_node_ids)
 
-    resources_before = (
+    resources_before = set(
         ContentNode.objects.filter(channel_id=channel.id, available=True)
         .exclude(kind=content_kinds.TOPIC)
-        .count()
+        .values_list("id", flat=True)
     )
 
     # If we have been passed node ids do not do a full deletion pass
@@ -39,13 +45,16 @@ def delete_metadata(
     # If everything has been made invisible, delete all the metadata
     delete_all_metadata = delete_all_metadata or not channel.root.available
 
-    total_resource_number = (
-        resources_before
-        - ContentNode.objects.filter(channel_id=channel.id, available=True)
+    resources_after = set(
+        ContentNode.objects.filter(channel_id=channel.id, available=True)
         .exclude(kind=content_kinds.TOPIC)
-        .count()
+        .values_list("id", flat=True)
     )
 
+    removed_resources = resources_before.difference(resources_after)
+
+    total_resource_number = len(removed_resources)
+
     if force_delete:
         # Do this before we delete all the metadata, as otherwise we lose
         # track of which local files were associated with the channel we
@@ -62,7 +71,7 @@ def delete_metadata(
         )
 
         with db_lock():
-            propagate_forced_localfile_removal(unused_files)
+            removed_resources.update(propagate_forced_localfile_removal(unused_files))
         # Separate these operations as running the SQLAlchemy code in the latter
         # seems to cause the Django ORM interactions in the former to roll back
         # Not quite sure what is causing it, but presumably due to transaction
@@ -74,6 +83,9 @@ def delete_metadata(
         with db_lock():
             channel.delete_content_tree_and_files()
 
+    if update_content_requests and removed_resources:
+        propagate_contentnode_removal(list(removed_resources))
+
     # Clear any previously set channel availability stats for this channel
     clear_channel_stats(channel.id)
 
@@ -135,12 +147,21 @@ def add_arguments(self, parser):
             help="Don't modify admin_imported values when deleting content",
         )
 
+        parser.add_argument(
+            "--update_content_requests",
+            action="store_false",
+            dest="update_content_requests",
+            default=True,
+            help="Don't modify the status of ContentRequests pointing at the deleted content",
+        )
+
     def handle_async(self, *args, **options):
         channel_id = options["channel_id"]
         node_ids = options["node_ids"]
         exclude_node_ids = options["exclude_node_ids"]
         force_delete = options["force_delete"]
         ignore_admin_flags = options["ignore_admin_flags"]
+        update_content_requests = options["update_content_requests"]
 
         try:
             channel = ChannelMetadata.objects.get(pk=channel_id)
@@ -150,7 +171,12 @@ def handle_async(self, *args, **options):
             )
 
         (total_resource_number, delete_all_metadata,) = delete_metadata(
-            channel, node_ids, exclude_node_ids, force_delete, ignore_admin_flags
+            channel,
+            node_ids,
+            exclude_node_ids,
+            force_delete,
+            ignore_admin_flags,
+            update_content_requests,
         )
         unused_files = LocalFile.objects.get_unused_files()
         # Get the number of files that are being deleted
diff --git a/kolibri/core/content/migrations/0035_add_imscp_preset.py b/kolibri/core/content/migrations/0035_add_imscp_preset.py
new file mode 100644
index 00000000000..8573a8110a0
--- /dev/null
+++ b/kolibri/core/content/migrations/0035_add_imscp_preset.py
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.29 on 2023-10-20 07:03
+from __future__ import unicode_literals
+
+from django.db import migrations
+from django.db import models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("content", "0034_contentrequest_source_instance_id"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="file",
+            name="preset",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("high_res_video", "High Resolution"),
+                    ("low_res_video", "Low Resolution"),
+                    ("video_thumbnail", "Thumbnail"),
+                    ("video_subtitle", "Subtitle"),
+                    ("video_dependency", "Video (dependency)"),
+                    ("audio", "Audio"),
+                    ("audio_thumbnail", "Thumbnail"),
+                    ("audio_dependency", "audio (dependency)"),
+                    ("document", "Document"),
+                    ("epub", "ePub Document"),
+                    ("document_thumbnail", "Thumbnail"),
+                    ("exercise", "Exercise"),
+                    ("exercise_thumbnail", "Thumbnail"),
+                    ("exercise_image", "Exercise Image"),
+                    ("exercise_graphie", "Exercise Graphie"),
+                    ("channel_thumbnail", "Channel Thumbnail"),
+                    ("topic_thumbnail", "Thumbnail"),
+                    ("html5_zip", "HTML5 Zip"),
+                    ("html5_dependency", "HTML5 Dependency (Zip format)"),
+                    ("html5_thumbnail", "HTML5 Thumbnail"),
+                    ("h5p", "H5P Zip"),
+                    ("h5p_thumbnail", "H5P Thumbnail"),
+                    ("zim", "Zim"),
+                    ("zim_thumbnail", "Zim Thumbnail"),
+                    ("qti", "QTI Zip"),
+                    ("qti_thumbnail", "QTI Thumbnail"),
+                    ("slideshow_image", "Slideshow Image"),
+                    ("slideshow_thumbnail", "Slideshow Thumbnail"),
+                    ("slideshow_manifest", "Slideshow Manifest"),
+                    ("imscp_zip", "IMSCP Zip"),
+                ],
+                max_length=150,
+            ),
+        ),
+    ]
diff --git a/kolibri/core/content/models.py b/kolibri/core/content/models.py
index 4dca91162f8..2e0e16b8827 100644
--- a/kolibri/core/content/models.py
+++ b/kolibri/core/content/models.py
@@ -446,6 +446,20 @@ def _hex_uuid_str():
     return str(uuid.uuid4().hex)
 
 
+class ContentRequestManager(models.Manager):
+    request_type = None
+
+    def get_queryset(self):
+        """
+        Automatically filters on the request type for use with proxy models
+        :rtype: django.db.models.QuerySet
+        """
+        queryset = super(ContentRequestManager, self).get_queryset()
+        if self.request_type is not None:
+            queryset = queryset.filter(type=self.request_type)
+        return queryset
+
+
 class ContentRequest(models.Model):
     """
     Model representing requests for specific content, either through user interaction or as a
@@ -475,6 +489,8 @@ class ContentRequest(models.Model):
     contentnode_id = UUIDField()
     metadata = JSONField(null=True)
 
+    objects = ContentRequestManager()
+
     class Meta:
         unique_together = ("type", "source_model", "source_id", "contentnode_id")
         ordering = ("requested_at",)
@@ -517,18 +533,6 @@ def total_progress(self):
         return self.metadata.get("total_progress", 0) if self.metadata else 0
 
 
-class ContentRequestManager(models.Manager):
-    request_type = None
-
-    def get_queryset(self):
-        """
-        Automatically filters on the request type for use with proxy models
-        :rtype: django.db.models.QuerySet
-        """
-        queryset = super(ContentRequestManager, self).get_queryset()
-        return queryset.filter(type=self.request_type)
-
-
 class ContentDownloadRequestManager(ContentRequestManager):
     request_type = ContentRequestType.Download
 
diff --git a/kolibri/core/content/tasks.py b/kolibri/core/content/tasks.py
index 02a1e3d1eb3..be45a50b416 100644
--- a/kolibri/core/content/tasks.py
+++ b/kolibri/core/content/tasks.py
@@ -9,11 +9,14 @@
 from kolibri.core.auth.models import FacilityDataset
 from kolibri.core.content.models import ChannelMetadata
 from kolibri.core.content.models import ContentRequest
+from kolibri.core.content.models import ContentRequestReason
 from kolibri.core.content.models import ContentRequestStatus
 from kolibri.core.content.models import ContentRequestType
 from kolibri.core.content.utils.channel_import import import_channel_from_data
 from kolibri.core.content.utils.channels import get_mounted_drive_by_id
 from kolibri.core.content.utils.channels import read_channel_metadata_from_db_file
+from kolibri.core.content.utils.content_request import incomplete_removals_queryset
+from kolibri.core.content.utils.content_request import process_content_removal_requests
 from kolibri.core.content.utils.content_request import process_content_requests
 from kolibri.core.content.utils.content_request import synchronize_content_requests
 from kolibri.core.content.utils.paths import get_channel_lookup_url
@@ -394,6 +397,21 @@ def automatic_resource_import():
         process_content_requests()
 
 
+@register_task(
+    queue=QUEUE,
+    long_running=True,
+    status_fn=get_status,
+)
+def automatic_user_imported_resource_cleanup():
+    """
+    Processes content removal requests
+    """
+    incomplete_user_removals = incomplete_removals_queryset().filter(
+        reason=ContentRequestReason.UserInitiated
+    )
+    process_content_removal_requests(incomplete_user_removals)
+
+
 @register_task(
     long_running=True,
     status_fn=get_status,
diff --git a/kolibri/core/content/test/utils/test_content_request.py b/kolibri/core/content/test/utils/test_content_request.py
index cef00a5d9cb..3335f9b7a21 100644
--- a/kolibri/core/content/test/utils/test_content_request.py
+++ b/kolibri/core/content/test/utils/test_content_request.py
@@ -884,6 +884,7 @@ def test_basic(self):
             self.node.channel_id,
             node_ids=[self.request.contentnode_id],
             ignore_admin_flags=True,
+            update_content_requests=False,
         )
         self.assertEqual(self.qs.count(), 0)
         self.assertEqual(ContentDownloadRequest.objects.count(), 0)
diff --git a/kolibri/core/content/utils/annotation.py b/kolibri/core/content/utils/annotation.py
index e7ff6c9450e..fe9d4f51658 100644
--- a/kolibri/core/content/utils/annotation.py
+++ b/kolibri/core/content/utils/annotation.py
@@ -690,6 +690,7 @@ def propagate_forced_localfile_removal(localfiles_dict_list):
     # if we have too many UUIDs it is possible we might still generate too much SQL
     # and cause issues - so we batch the ids here.
     batch_size = 10000
+    removed_nodes = []
     while i < total:
         file_slice = localfiles_dict_list[i : i + batch_size]
         files = File.objects.filter(
@@ -698,8 +699,12 @@ def propagate_forced_localfile_removal(localfiles_dict_list):
                 [f["id"] for f in file_slice]
             ),
         )
+        removed_nodes += ContentNode.objects.filter(files__in=files).values_list(
+            "id", flat=True
+        )
         ContentNode.objects.filter(files__in=files).update(available=False)
         i += batch_size
+    return removed_nodes
 
 
 def reannotate_all_channels():
diff --git a/kolibri/core/content/utils/content_request.py b/kolibri/core/content/utils/content_request.py
index 37fdb75a2a6..89a7de7714d 100644
--- a/kolibri/core/content/utils/content_request.py
+++ b/kolibri/core/content/utils/content_request.py
@@ -22,6 +22,7 @@
 from kolibri.core.content.models import ContentDownloadRequest
 from kolibri.core.content.models import ContentNode
 from kolibri.core.content.models import ContentRemovalRequest
+from kolibri.core.content.models import ContentRequest
 from kolibri.core.content.models import ContentRequestReason
 from kolibri.core.content.models import ContentRequestStatus
 from kolibri.core.content.models import File
@@ -43,7 +44,9 @@
 from kolibri.core.discovery.utils.network.connections import capture_connection_state
 from kolibri.core.discovery.utils.network.errors import NetworkLocationResponseFailure
 from kolibri.core.utils.urls import reverse_path
+from kolibri.utils.conf import OPTIONS
 from kolibri.utils.data import bytes_for_humans
+from kolibri.utils.file_transfer import ChunkedFileDirectoryManager
 
 
 logger = logging.getLogger(__name__)
@@ -663,6 +666,7 @@ def _process_content_requests(incomplete_downloads):
     has_processed_sync_removals = False
     has_processed_user_removals = False
     has_processed_user_downloads = False
+    has_freed_space_in_stream_cache = False
     qs = incomplete_downloads_with_metadata.all()
 
     # loop while we have pending downloads
@@ -710,6 +714,16 @@ def _process_content_requests(incomplete_downloads):
                 has_processed_user_downloads = True
                 process_user_downloads_for_removal()
                 continue
+            if not has_freed_space_in_stream_cache:
+                # try to clear space, then repeat
+                has_freed_space_in_stream_cache = True
+                chunked_file_manager = ChunkedFileDirectoryManager(
+                    OPTIONS["Paths"]["CONTENT_DIR"]
+                )
+                chunked_file_manager.evict_files(
+                    calc.get_additional_free_space_needed()
+                )
+                continue
             raise InsufficientStorage(
                 "Content download requests need {} of free space".format(
                     bytes_for_humans(_total_size(incomplete_downloads_with_metadata))
@@ -930,6 +944,7 @@ def process_content_removal_requests(queryset):
                 channel_id,
                 node_ids=contentnode_ids,
                 ignore_admin_flags=True,
+                update_content_requests=False,
             )
             # mark all as completed
             channel_requests.update(status=ContentRequestStatus.Completed)
@@ -946,6 +961,27 @@ def process_content_removal_requests(queryset):
     remaining_pending.update(status=ContentRequestStatus.Completed)
 
 
+def propagate_contentnode_removal(contentnode_ids):
+    """
+    Deletes all learner initiated ContentRequests for the passed in contentnode_ids
+    Matching learner initiated ContentRequests will be deleted - this means that if
+    resources are deleted by an admin, we remove any associated learner initiated requests.
+    Also updates the status of any COMPLETED non-learner initiated ContentDownloadRequests to PENDING
+    """
+    BATCH_SIZE = 250
+    for i in range(0, len(contentnode_ids), BATCH_SIZE):
+        batch = contentnode_ids[i : i + BATCH_SIZE]
+        ContentRequest.objects.filter(
+            contentnode_id__in=batch, reason=ContentRequestReason.UserInitiated
+        ).delete()
+        ContentDownloadRequest.objects.filter(
+            contentnode_id__in=batch,
+            status=ContentRequestStatus.Completed,
+        ).exclude(reason=ContentRequestReason.UserInitiated).update(
+            status=ContentRequestStatus.Pending
+        )
+
+
 class StorageCalculator:
     def __init__(self, incomplete_downloads_queryset):
         incomplete_removals = incomplete_removals_queryset()
@@ -970,12 +1006,13 @@ def __init__(self, incomplete_downloads_queryset):
             total_size=_total_size_annotation(available=True),
         )
         self.free_space = 0
+        self.incomplete_downloads_size = 0
 
     def _calculate_space_available(self):
+        self.incomplete_downloads_size = _total_size(self.incomplete_downloads)
         free_space = get_free_space_for_downloads(
             completed_size=_total_size(completed_downloads_queryset())
         )
-        free_space -= _total_size(self.incomplete_downloads)
         free_space += _total_size(self.incomplete_sync_removals)
         free_space += _total_size(self.incomplete_user_removals)
         free_space += _total_size(self.complete_user_downloads)
@@ -984,4 +1021,8 @@ def _calculate_space_available(self):
 
     def is_space_sufficient(self):
         self._calculate_space_available()
-        return self.free_space > _total_size(self.incomplete_downloads)
+        return self.free_space > self.incomplete_downloads_size
+
+    def get_additional_free_space_needed(self):
+        self._calculate_space_available()
+        return self.incomplete_downloads_size - self.free_space
diff --git a/kolibri/core/content/utils/resource_import.py b/kolibri/core/content/utils/resource_import.py
index 5df3cb8f6b9..78759de2fba 100644
--- a/kolibri/core/content/utils/resource_import.py
+++ b/kolibri/core/content/utils/resource_import.py
@@ -47,6 +47,15 @@ def lookup_channel_listing_status(channel_id, baseurl=None):
     """
     resp = requests.get(get_channel_lookup_url(identifier=channel_id, baseurl=baseurl))
 
+    # Raise here to prevent trying to fetch a channel from a remote that it is not
+    # available from.
+    try:
+        resp.raise_for_status()
+    except requests.exceptions.RequestException:
+        raise LocationError(
+            "Channel {} not found on remote {}".format(channel_id, baseurl)
+        )
+
     if resp.status_code != 200:
         return None
 
diff --git a/kolibri/core/device/api.py b/kolibri/core/device/api.py
index 79be3a9bfa8..6d2e30142ef 100644
--- a/kolibri/core/device/api.py
+++ b/kolibri/core/device/api.py
@@ -47,6 +47,7 @@
 from kolibri.core.content.models import ContentDownloadRequest
 from kolibri.core.content.models import ContentRemovalRequest
 from kolibri.core.content.models import ContentRequestReason
+from kolibri.core.content.models import ContentRequestStatus
 from kolibri.core.content.permissions import CanManageContent
 from kolibri.core.content.utils.channels import get_mounted_drive_by_id
 from kolibri.core.content.utils.channels import get_mounted_drives_with_channel_info
@@ -302,6 +303,7 @@ class UserSyncStatusViewSet(ReadOnlyValuesViewset):
         "user",
         "has_downloads",
         "last_download_removed",
+        "sync_downloads_in_progress",
     )
 
     field_map = {
@@ -338,14 +340,40 @@ def annotate_queryset(self, queryset):
             instance_id=OuterRef("sync_session__client_instance_id"),
         )
 
+        # Use the same condition used in the ContentRequest API endpoint
+        # otherwise, this will signal that users have downloads
+        # but when they navigate to the Downloads page, they may not see
+        # any downloads.
+        downloads_without_removals_queryset = ContentDownloadRequest.objects.annotate(
+            has_removal=Exists(
+                ContentRemovalRequest.objects.filter(
+                    source_model=OuterRef("source_model"),
+                    source_id=OuterRef("source_id"),
+                    contentnode_id=OuterRef("contentnode_id"),
+                    requested_at__gte=OuterRef("requested_at"),
+                    reason=OuterRef("reason"),
+                ).exclude(status=ContentRequestStatus.Failed)
+            )
+        ).filter(has_removal=False)
+
         has_download = Exists(
-            ContentDownloadRequest.objects.filter(
+            downloads_without_removals_queryset.filter(
                 source_id=OuterRef("user_id"),
                 source_model=FacilityUser.morango_model_name,
                 reason=ContentRequestReason.UserInitiated,
             )
         )
 
+        has_in_progress_sync_initiated_download = Exists(
+            downloads_without_removals_queryset.filter(
+                source_id=OuterRef("user_id"),
+                source_model=FacilityUser.morango_model_name,
+                reason=ContentRequestReason.SyncInitiated,
+            ).exclude(
+                status__in=[ContentRequestStatus.Failed, ContentRequestStatus.Completed]
+            )
+        )
+
         last_download_removal = Subquery(
             ContentRemovalRequest.objects.filter(
                 source_id=OuterRef("user_id"),
@@ -366,6 +394,7 @@ def annotate_queryset(self, queryset):
             ),
             has_downloads=has_download,
             last_download_removed=last_download_removal,
+            sync_downloads_in_progress=has_in_progress_sync_initiated_download,
         )
         return queryset
 
diff --git a/kolibri/core/device/serializers.py b/kolibri/core/device/serializers.py
index a34e681e69a..81f5f49a06a 100644
--- a/kolibri/core/device/serializers.py
+++ b/kolibri/core/device/serializers.py
@@ -13,6 +13,7 @@
 from kolibri.core.content.tasks import automatic_synchronize_content_requests_and_import
 from kolibri.core.device.models import DevicePermissions
 from kolibri.core.device.models import DeviceSettings
+from kolibri.core.device.models import OSUser
 from kolibri.core.device.utils import APP_AUTH_TOKEN_COOKIE_NAME
 from kolibri.core.device.utils import provision_device
 from kolibri.core.device.utils import provision_single_user_device
@@ -76,8 +77,7 @@ class Meta:
 
     def validate(self, data):
         if (
-            "superuser" not in data
-            and GET_OS_USER in interface
+            GET_OS_USER in interface
             and "request" in self.context
             and valid_app_key_on_request(self.context["request"])
         ):
@@ -163,7 +163,7 @@ def create(self, validated_data):  # noqa C901
 
             auth_token = validated_data.pop("auth_token", None)
 
-            if not auth_token:
+            if "superuser" in validated_data:
                 superuser_data = validated_data["superuser"]
                 # We've imported a facility if the username exists
                 try:
@@ -183,11 +183,22 @@ def create(self, validated_data):  # noqa C901
                         raise ParseError(
                             "`username`, `password`, or `full_name` are missing in `superuser`"
                         )
+                if auth_token:
+                    # If we have an auth token, we need to create an OSUser for the superuser
+                    # so that we can associate the user with the OSUser
+                    os_username, _ = interface.get_os_user(auth_token)
+                    OSUser.objects.update_or_create(
+                        os_username=os_username, defaults={"user": superuser}
+                    )
 
-            else:
+            elif auth_token:
                 superuser = FacilityUser.objects.get_or_create_os_user(
                     auth_token, facility=facility
                 )
+            else:
+                raise ParseError(
+                    "Either `superuser` or `auth_token` must be provided for provisioning"
+                )
 
             is_soud = validated_data.pop("is_soud")
 
diff --git a/kolibri/core/device/test/test_api.py b/kolibri/core/device/test/test_api.py
index 867b258e2b7..78deffc71bd 100644
--- a/kolibri/core/device/test/test_api.py
+++ b/kolibri/core/device/test/test_api.py
@@ -32,6 +32,8 @@
 from kolibri.core.auth.test.test_api import FacilityFactory
 from kolibri.core.auth.test.test_api import FacilityUserFactory
 from kolibri.core.content.models import ContentDownloadRequest
+from kolibri.core.content.models import ContentRemovalRequest
+from kolibri.core.content.models import ContentRequestReason
 from kolibri.core.device.models import DevicePermissions
 from kolibri.core.device.models import DeviceSettings
 from kolibri.core.device.models import DeviceStatus
@@ -929,10 +931,64 @@ def test_downloads_queryset(self):
         device_status = self._create_device_status("oopsie", StatusSentiment.Neutral)
         self.syncsession1.client_instance_id = device_status.instance_id
         self.syncsession1.save()
-        response = self.client.get(reverse("kolibri:core:usersyncstatus-list"))
         content_request.save()
+        response = self.client.get(reverse("kolibri:core:usersyncstatus-list"))
         self.assertEqual(len(response.data), 1)
         self.assertEqual(response.data[0]["user"], self.user1.id)
         self.assertEqual(response.data[0]["status"], user_sync_statuses.RECENTLY_SYNCED)
-        self.assertFalse(response.data[0]["has_downloads"])
+        self.assertTrue(response.data[0]["has_downloads"])
         self.assertIsNone(response.data[0]["last_download_removed"])
+
+    def test_downloads_queryset__content_request_removed(self):
+        self.client.login(
+            username=self.user1.username,
+            password=DUMMY_PASSWORD,
+            facility=self.facility,
+        )
+        self._create_transfer_session(
+            active=False,
+        )
+        content_request = ContentDownloadRequest.build_for_user(self.user1)
+        content_request.contentnode_id = uuid.uuid4().hex
+        content_request.save()
+        content_removal_request = ContentRemovalRequest.build_for_user(self.user1)
+        content_removal_request.contentnode_id = content_request.contentnode_id
+        content_removal_request.save()
+        response = self.client.get(reverse("kolibri:core:usersyncstatus-list"))
+        self.assertFalse(response.data[0]["has_downloads"])
+
+    def test_downloads_queryset__sync_downloads_in_progress(self):
+        self.client.login(
+            username=self.user1.username,
+            password=DUMMY_PASSWORD,
+            facility=self.facility,
+        )
+        self._create_transfer_session(
+            active=False,
+        )
+        content_request = ContentDownloadRequest.build_for_user(self.user1)
+        content_request.contentnode_id = uuid.uuid4().hex
+        content_request.reason = ContentRequestReason.SyncInitiated
+        content_request.save()
+        response = self.client.get(reverse("kolibri:core:usersyncstatus-list"))
+        self.assertTrue(response.data[0]["sync_downloads_in_progress"])
+
+    def test_downloads_queryset__sync_downloads_in_progress_removed(self):
+        self.client.login(
+            username=self.user1.username,
+            password=DUMMY_PASSWORD,
+            facility=self.facility,
+        )
+        self._create_transfer_session(
+            active=False,
+        )
+        content_request = ContentDownloadRequest.build_for_user(self.user1)
+        content_request.contentnode_id = uuid.uuid4().hex
+        content_request.reason = ContentRequestReason.SyncInitiated
+        content_request.save()
+        content_removal_request = ContentRemovalRequest.build_for_user(self.user1)
+        content_removal_request.contentnode_id = content_request.contentnode_id
+        content_removal_request.reason = ContentRequestReason.SyncInitiated
+        content_removal_request.save()
+        response = self.client.get(reverse("kolibri:core:usersyncstatus-list"))
+        self.assertFalse(response.data[0]["sync_downloads_in_progress"])
diff --git a/kolibri/core/deviceadmin/tasks.py b/kolibri/core/deviceadmin/tasks.py
index c2618e321cd..d9e7656c26d 100644
--- a/kolibri/core/deviceadmin/tasks.py
+++ b/kolibri/core/deviceadmin/tasks.py
@@ -7,6 +7,8 @@
 from kolibri.core.tasks.decorators import register_task
 from kolibri.core.tasks.exceptions import JobRunning
 from kolibri.core.utils.lock import db_lock
+from kolibri.utils.conf import OPTIONS
+from kolibri.utils.file_transfer import ChunkedFileDirectoryManager
 from kolibri.utils.time_utils import local_now
 
 
@@ -69,3 +71,22 @@ def schedule_vacuum():
         perform_vacuum.enqueue_at(vacuum_time, repeat=None, interval=24 * 60 * 60)
     except JobRunning:
         pass
+
+
+# Constant job id for streamed cache cleanup task
+STREAMED_CACHE_CLEANUP_JOB_ID = "streamed_cache_cleanup"
+
+
+@register_task(job_id=STREAMED_CACHE_CLEANUP_JOB_ID)
+def streamed_cache_cleanup():
+    manager = ChunkedFileDirectoryManager(OPTIONS["Paths"]["CONTENT_DIR"])
+    manager.limit_files(OPTIONS["Cache"]["STREAMED_FILE_CACHE_SIZE"])
+
+
+def schedule_streamed_cache_cleanup():
+    try:
+        streamed_cache_cleanup.enqueue_in(
+            timedelta(hours=1), repeat=None, interval=60 * 60
+        )
+    except JobRunning:
+        pass
diff --git a/kolibri/core/discovery/api.py b/kolibri/core/discovery/api.py
index 6cfa4ed3de6..8b06a3752c9 100644
--- a/kolibri/core/discovery/api.py
+++ b/kolibri/core/discovery/api.py
@@ -2,6 +2,7 @@
 from rest_framework import decorators
 from rest_framework import viewsets
 from rest_framework.exceptions import NotFound
+from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 
 from .models import DynamicNetworkLocation
@@ -17,8 +18,6 @@
 from .utils.network.connections import capture_connection_state
 from .utils.network.connections import update_network_location
 from kolibri.core.api import ValuesViewset
-from kolibri.core.auth.api import KolibriAuthPermissions
-from kolibri.core.auth.api import KolibriAuthPermissionsFilter
 from kolibri.core.device.permissions import NotProvisionedHasPermission
 from kolibri.core.utils.urls import reverse_path
 
@@ -112,18 +111,9 @@ def retrieve(self, request, pk=None):
 
 
 class PinnedDeviceViewSet(ValuesViewset):
-    values = ("user", "instance_id", "id")
+    values = ("instance_id", "id")
     serializer_class = PinnedDeviceSerializer
-    queryset = PinnedDevice.objects.all()
-    permission_classes = (KolibriAuthPermissions,)
-    filter_backends = (
-        KolibriAuthPermissionsFilter,
-        DjangoFilterBackend,
-    )
-    filter_fields = ("instance_id",)
-
-    def post(self, request):
-        serializer = self.serializer(data=request.data)
-        # following will automatically raise an exception if the serialize data is not valid
-        serializer.is_valid(raise_exception=True)
-        return Response(serializer.validated_data)
+    permission_classes = (IsAuthenticated,)
+
+    def get_queryset(self):
+        return PinnedDevice.objects.filter(user=self.request.user)
diff --git a/kolibri/core/discovery/migrations/0012_remove_pinned_device.py b/kolibri/core/discovery/migrations/0012_remove_pinned_device.py
new file mode 100644
index 00000000000..a6e64b36232
--- /dev/null
+++ b/kolibri/core/discovery/migrations/0012_remove_pinned_device.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.29 on 2023-10-17 23:38
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("discovery", "0011_remove_networklocation_dynamic"),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name="pinneddevice",
+            unique_together=set([]),
+        ),
+        migrations.RemoveField(
+            model_name="pinneddevice",
+            name="user",
+        ),
+        migrations.DeleteModel(
+            name="PinnedDevice",
+        ),
+    ]
diff --git a/kolibri/core/discovery/migrations/0013_recreate_pinned_device.py b/kolibri/core/discovery/migrations/0013_recreate_pinned_device.py
new file mode 100644
index 00000000000..2bcef951091
--- /dev/null
+++ b/kolibri/core/discovery/migrations/0013_recreate_pinned_device.py
@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.29 on 2023-10-17 23:41
+from __future__ import unicode_literals
+
+import django.db.models.deletion
+import django.utils.timezone
+import morango.models.fields.uuids
+from django.conf import settings
+from django.db import migrations
+from django.db import models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("discovery", "0012_remove_pinned_device"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="PinnedDevice",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("instance_id", morango.models.fields.uuids.UUIDField()),
+                (
+                    "created",
+                    models.DateTimeField(
+                        db_index=True, default=django.utils.timezone.now
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+        ),
+        migrations.AlterUniqueTogether(
+            name="pinneddevice",
+            unique_together=set([("user", "instance_id")]),
+        ),
+    ]
diff --git a/kolibri/core/discovery/models.py b/kolibri/core/discovery/models.py
index 9fb6c8d2014..6595fea1d69 100644
--- a/kolibri/core/discovery/models.py
+++ b/kolibri/core/discovery/models.py
@@ -3,6 +3,7 @@
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.utils import timezone
+from morango.models import UUIDField
 
 from kolibri.core.auth.models import FacilityUser
 from kolibri.core.auth.permissions.general import IsOwn
@@ -259,8 +260,7 @@ def allow_migrate(self, db, app_label, model_name=None, **hints):
 
 class PinnedDevice(models.Model):
 
-    id = models.UUIDField(primary_key=True, max_length=36, default=_uuid_string)
-    instance_id = models.UUIDField(blank=False)
+    instance_id = UUIDField(blank=False)
     user = models.ForeignKey(FacilityUser, blank=False)
     created = models.DateTimeField(default=timezone.now, db_index=True)
 
diff --git a/kolibri/core/discovery/serializers.py b/kolibri/core/discovery/serializers.py
index 6492b98d31e..9486669c60c 100644
--- a/kolibri/core/discovery/serializers.py
+++ b/kolibri/core/discovery/serializers.py
@@ -11,7 +11,6 @@
 from .models import PinnedDevice
 from .utils.network import errors
 from .utils.network.client import NetworkClient
-from kolibri.core.auth.models import FacilityUser
 from kolibri.core.serializers import HexOnlyUUIDField
 
 
@@ -75,10 +74,16 @@ class PinnedDeviceSerializer(ModelSerializer):
     Serializer for handling requests regarding a user's Pinned Devices
     """
 
-    id = HexOnlyUUIDField(required=False)
-    user = serializers.PrimaryKeyRelatedField(queryset=FacilityUser.objects.all())
     instance_id = HexOnlyUUIDField()
 
     class Meta:
         model = PinnedDevice
-        fields = ("instance_id", "user", "id")
+        fields = ("instance_id", "id")
+
+    def create(self, validated_data):
+        if "request" in self.context and self.context["request"].user is not None:
+            user = self.context["request"].user
+        else:
+            raise serializers.ValidationError("User must be defined")
+        validated_data["user"] = user
+        return super(PinnedDeviceSerializer, self).create(validated_data)
diff --git a/kolibri/core/discovery/test/test_api.py b/kolibri/core/discovery/test/test_api.py
index 34a6e730953..e34782514b9 100644
--- a/kolibri/core/discovery/test/test_api.py
+++ b/kolibri/core/discovery/test/test_api.py
@@ -10,6 +10,8 @@
 from rest_framework import status
 from rest_framework.status import HTTP_200_OK
 from rest_framework.status import HTTP_201_CREATED
+from rest_framework.status import HTTP_204_NO_CONTENT
+from rest_framework.status import HTTP_404_NOT_FOUND
 from rest_framework.test import APITestCase
 
 from .. import models
@@ -145,6 +147,9 @@ def setUpTestData(cls):
         cls.network_location2 = models.NetworkLocation.objects.create(
             base_url="https://anotherone.moc"
         )
+        cls.network_location3 = models.NetworkLocation.objects.create(
+            base_url="https://anotherotherone.moc"
+        )
 
     def setUp(self):
         self.client.login(
@@ -172,6 +177,11 @@ def test_fetch_pinned_devices(self):
             user=self.user, instance_id=self.network_location2.id
         )
 
+        other_user = FacilityUserFactory(facility=self.facility)
+        other_pin = models.PinnedDevice.objects.create(
+            user=other_user, instance_id=self.network_location3.id
+        )
+
         pin_ids = sorted([my_pin.instance_id, my_second_pin.instance_id])
 
         response = self.client.get(
@@ -179,8 +189,33 @@ def test_fetch_pinned_devices(self):
         )
         self.assertEqual(response.status_code, HTTP_200_OK)
         self.assertEqual(len(response.data), 2)
-        # TODO - Get this working
-        #      - Discuss & write any more tasks
-        #      - Start onto the frontend
-        response_ids = sorted([item["instance_id"].hex for item in response.data])
+        response_ids = sorted([item["instance_id"] for item in response.data])
         self.assertEqual(response_ids, pin_ids)
+        self.assertNotIn(other_pin.instance_id, response_ids)
+
+    def test_delete_own_pinned_devices(self):
+        """
+        Tests the API for deleting Pinned Devices
+        """
+        my_pin = models.PinnedDevice.objects.create(
+            user=self.user, instance_id=self.network_location.id
+        )
+
+        response = self.client.delete(
+            reverse("kolibri:core:pinned_devices-detail", kwargs={"pk": my_pin.id}),
+        )
+        self.assertEqual(response.status_code, HTTP_204_NO_CONTENT)
+
+    def test_delete_other_pinned_devices(self):
+        """
+        Tests the API for deleting Pinned Devices
+        """
+        other_user = FacilityUserFactory(facility=self.facility)
+        other_pin = models.PinnedDevice.objects.create(
+            user=other_user, instance_id=self.network_location.id
+        )
+
+        response = self.client.delete(
+            reverse("kolibri:core:pinned_devices-detail", kwargs={"pk": other_pin.id}),
+        )
+        self.assertEqual(response.status_code, HTTP_404_NOT_FOUND)
diff --git a/kolibri/core/package.json b/kolibri/core/package.json
index d492220498b..2f0d6fb195b 100644
--- a/kolibri/core/package.json
+++ b/kolibri/core/package.json
@@ -9,7 +9,7 @@
     "@vueuse/core": "^9.13.0",
     "axios": "^1.5.1",
     "clipboard": "^2.0.11",
-    "core-js": "^3.32",
+    "core-js": "^3.33",
     "csv-generator-client": "^2.1.1",
     "date-fns": "^1.28.2",
     "deep-object-diff": "^1.1.9",
@@ -21,7 +21,7 @@
     "js-cookie": "^3.0.5",
     "knuth-shuffle-seeded": "^1.0.6",
     "kolibri-constants": "0.2.0",
-    "kolibri-design-system": "https://github.com/learningequality/kolibri-design-system#3ab9801a442b20ddf63248b17ca0d83fe21133fb",
+    "kolibri-design-system": "https://github.com/learningequality/kolibri-design-system#ab03c5e257a7806c67cf6250310e3e6ccb5119c9",
     "lockr": "0.8.5",
     "lodash": "^4.17.21",
     "loglevel": "^1.8.1",
diff --git a/kolibri/core/tasks/api.py b/kolibri/core/tasks/api.py
index f7749e4b2b1..6e5ff71c041 100644
--- a/kolibri/core/tasks/api.py
+++ b/kolibri/core/tasks/api.py
@@ -150,7 +150,7 @@ def _enqueue_job_based_on_enqueue_args(self, registered_task, job, enqueue_args)
                 enqueue_args["enqueue_at"],
                 job,
                 queue=registered_task.queue,
-                priority=registered_task.priority,
+                priority=enqueue_args.get("priority", registered_task.priority),
                 interval=enqueue_args.get("repeat_interval", 0),
                 repeat=enqueue_args.get("repeat", 0),
                 retry_interval=enqueue_args.get("retry_interval", None),
@@ -160,7 +160,7 @@ def _enqueue_job_based_on_enqueue_args(self, registered_task, job, enqueue_args)
                 enqueue_args["enqueue_in"],
                 job,
                 queue=registered_task.queue,
-                priority=registered_task.priority,
+                priority=enqueue_args.get("priority", registered_task.priority),
                 interval=enqueue_args.get("repeat_interval", 0),
                 repeat=enqueue_args.get("repeat", 0),
                 retry_interval=enqueue_args.get("retry_interval", None),
@@ -168,7 +168,7 @@ def _enqueue_job_based_on_enqueue_args(self, registered_task, job, enqueue_args)
         return job_storage.enqueue_job(
             job,
             queue=registered_task.queue,
-            priority=registered_task.priority,
+            priority=enqueue_args.get("priority", registered_task.priority),
             retry_interval=enqueue_args.get("retry_interval", None),
         )
 
diff --git a/kolibri/core/tasks/test/test_api.py b/kolibri/core/tasks/test/test_api.py
index 03bf9127bee..342a006ab14 100644
--- a/kolibri/core/tasks/test/test_api.py
+++ b/kolibri/core/tasks/test/test_api.py
@@ -644,6 +644,14 @@ def test_erroneous_request(self, mock_job_storage):
                 "enqueue_at": self.enqueue_at_datetime,
                 "repeat": None,
             },
+            {  # Invalid priority specified.
+                "enqueue_at": self.enqueue_at_datetime,
+                "priority": 1,
+            },
+            {  # Priority set to None
+                "enqueue_at": self.enqueue_at_datetime,
+                "priority": None,
+            },
         ]
 
         for err_enq_arg in erroneous_enqueue_args:
@@ -694,6 +702,10 @@ def test_acceptable_request(self, mock_job_storage):
             {
                 "retry_interval": 900,
             },
+            {
+                "enqueue_at": self.enqueue_at_datetime,
+                "priority": 10,
+            },
         ]
 
         mock_job_storage.get_job.return_value = fake_job(state=State.QUEUED)
diff --git a/kolibri/core/tasks/validation.py b/kolibri/core/tasks/validation.py
index 0993744219e..c27cbbdf453 100644
--- a/kolibri/core/tasks/validation.py
+++ b/kolibri/core/tasks/validation.py
@@ -2,6 +2,8 @@
 from rest_framework import serializers
 from rest_framework.exceptions import ValidationError
 
+from .job import Priority
+
 
 class EnqueueArgsSerializer(serializers.Serializer):
     """
@@ -15,6 +17,7 @@ class EnqueueArgsSerializer(serializers.Serializer):
     retry_interval = serializers.IntegerField(
         required=False, allow_null=True, min_value=0
     )
+    priority = serializers.ChoiceField(choices=Priority.Priorities, required=False)
 
     def validate(self, data):
         if data.get("enqueue_at") and data.get("enqueue_in"):
diff --git a/kolibri/core/templates/kolibri/base.html b/kolibri/core/templates/kolibri/base.html
index 564bb1e3554..76226ba5104 100644
--- a/kolibri/core/templates/kolibri/base.html
+++ b/kolibri/core/templates/kolibri/base.html
@@ -10,7 +10,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <meta name="google" content="notranslate">
   {% theme_favicon %}
-  <title>{% trans "Kolibri" %}</title>
+  <title>{% site_title %}</title>
   {% if LANGUAGE_CODE == "ach-ug" %}
     <script type="text/javascript">
       var _jipt = [];
diff --git a/kolibri/core/templates/kolibri/unsupported_browser.html b/kolibri/core/templates/kolibri/unsupported_browser.html
index 3aacef2570c..88e3cb0483f 100644
--- a/kolibri/core/templates/kolibri/unsupported_browser.html
+++ b/kolibri/core/templates/kolibri/unsupported_browser.html
@@ -10,7 +10,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <meta name="google" content="notranslate">
   {% theme_favicon %}
-  <title>{% trans "Kolibri" %}</title>
+  <title>{% site_title %}</title>
   <style>
     body {
       margin: 0;
diff --git a/kolibri/core/templatetags/core_tags.py b/kolibri/core/templatetags/core_tags.py
index 07002c4c831..ee542fbc2f2 100644
--- a/kolibri/core/templatetags/core_tags.py
+++ b/kolibri/core/templatetags/core_tags.py
@@ -14,6 +14,7 @@
 from kolibri.core.hooks import FrontEndBaseHeadHook
 from kolibri.core.hooks import FrontEndBaseSyncHook
 from kolibri.core.theme_hook import ThemeHook
+from kolibri.utils.translation import ugettext as _
 
 register = template.Library()
 
@@ -71,3 +72,13 @@ def theme_favicon():
     favicon_url = favicon_urls[0] if favicon_urls else static("assets/logo.ico")
 
     return format_html('<link rel="shortcut icon" href="{}">', favicon_url)
+
+
+@register.simple_tag()
+def site_title():
+    """
+    Return the text of the site title, if provided by the theme. If not, the
+    default will be returned. The site title may be translated, to allow for
+    transliteration into other alphabets where needed.
+    """
+    return ThemeHook.get_theme().get("siteTitle", _("Kolibri"))
diff --git a/kolibri/plugins/coach/assets/src/modules/classSummary/__test__/actions.spec.js b/kolibri/plugins/coach/assets/src/modules/classSummary/__test__/actions.spec.js
new file mode 100644
index 00000000000..f70b4636db8
--- /dev/null
+++ b/kolibri/plugins/coach/assets/src/modules/classSummary/__test__/actions.spec.js
@@ -0,0 +1,65 @@
+import { NotificationObjects } from '../../../constants/notificationsConstants';
+import { updateWithNotifications } from '../actions';
+
+const { QUIZ } = NotificationObjects;
+
+describe('classSummary/actions', () => {
+  describe('updateWithNotifications', () => {
+    it('commits quiz notifications updates in a correct order (sorted by their datetime)', () => {
+      const state = {
+        learnerMap: { 'user-id': {} },
+        examMap: { 'quiz-id': {} },
+        contentNodeMap: {},
+        lessonMap: {},
+      };
+      const commit = jest.fn();
+      const dispatch = jest.fn();
+
+      const quizNotifications = [
+        {
+          id: 1,
+          user_id: 'user-id',
+          object: QUIZ,
+          event: 'Completed',
+          timestamp: '2023-10-05T13:35:00+02:00',
+          quiz_num_correct: 1,
+          quiz_num_answered: 2,
+          quiz_id: 'quiz-id',
+        },
+        {
+          id: 2,
+          user_id: 'user-id',
+          object: QUIZ,
+          event: 'Started',
+          timestamp: '2023-10-05T13:30:00+02:00',
+          quiz_num_correct: 2,
+          quiz_num_answered: 3,
+          quiz_id: 'quiz-id',
+        },
+      ];
+
+      updateWithNotifications({ state, commit, dispatch }, quizNotifications);
+
+      expect(commit).toHaveBeenCalledTimes(1);
+      expect(commit.mock.calls[0][0]).toBe('APPLY_NOTIFICATION_UPDATES');
+      expect(commit.mock.calls[0][1].examLearnerStatusMapUpdates).toEqual([
+        {
+          learner_id: 'user-id',
+          status: 'Started',
+          last_activity: new Date('2023-10-05T11:30:00.000Z'),
+          num_correct: 2,
+          num_answered: 3,
+          exam_id: 'quiz-id',
+        },
+        {
+          learner_id: 'user-id',
+          status: 'Completed',
+          last_activity: new Date('2023-10-05T11:35:00.000Z'),
+          num_correct: 1,
+          num_answered: 2,
+          exam_id: 'quiz-id',
+        },
+      ]);
+    });
+  });
+});
diff --git a/kolibri/plugins/coach/assets/src/modules/classSummary/actions.js b/kolibri/plugins/coach/assets/src/modules/classSummary/actions.js
index 22a88f146f8..85008edecec 100644
--- a/kolibri/plugins/coach/assets/src/modules/classSummary/actions.js
+++ b/kolibri/plugins/coach/assets/src/modules/classSummary/actions.js
@@ -9,8 +9,15 @@ export function updateWithNotifications(store, notifications) {
   const contentLearnerStatusMapUpdates = [];
   const { learnerMap, examMap, contentNodeMap, lessonMap } = store.state;
 
-  for (const nIdx in notifications) {
-    const notification = notifications[nIdx];
+  if (!notifications || !notifications.length) {
+    return;
+  }
+  const sortedNotifications = notifications.sort((n1, n2) => {
+    return new Date(n1.timestamp) - new Date(n2.timestamp);
+  });
+
+  for (const nIdx in sortedNotifications) {
+    const notification = sortedNotifications[nIdx];
     const { object } = notification;
 
     // Short-circuit the update if there are missing learners, exams, lessons,
diff --git a/kolibri/plugins/coach/assets/src/views/CoachImmersivePage.vue b/kolibri/plugins/coach/assets/src/views/CoachImmersivePage.vue
index abe047c6afa..6878fdbeb99 100644
--- a/kolibri/plugins/coach/assets/src/views/CoachImmersivePage.vue
+++ b/kolibri/plugins/coach/assets/src/views/CoachImmersivePage.vue
@@ -12,7 +12,7 @@
       :loading="loading"
       :appearanceOverrides="appearanceOverrides"
     >
-      <div class="coach-main">
+      <div v-if="!coreLoading" class="coach-main">
         <slot></slot>
       </div>
     </ImmersivePage>
@@ -103,6 +103,7 @@
     },
     computed: {
       ...mapState({
+        coreLoading: state => state.core.loading,
         error: state => state.core.error,
       }),
     },
@@ -120,12 +121,3 @@
   };
 
 </script>
-
-
-<style lang="scss" scoped>
-
-  .coach-main {
-    margin: 85px auto 0;
-  }
-
-</style>
diff --git a/kolibri/plugins/coach/assets/src/views/home/HomePage/OverviewBlock.vue b/kolibri/plugins/coach/assets/src/views/home/HomePage/OverviewBlock.vue
index dcd4a3c0492..de6374c8506 100644
--- a/kolibri/plugins/coach/assets/src/views/home/HomePage/OverviewBlock.vue
+++ b/kolibri/plugins/coach/assets/src/views/home/HomePage/OverviewBlock.vue
@@ -43,7 +43,7 @@
               :text="$tr('viewLearners')"
               appearance="basic-link"
               :to="classLearnersListRoute"
-              style="margin-left: 24 px;"
+              style="margin-left: 24px;"
             />
           </template>
         </template>
diff --git a/kolibri/plugins/coach/assets/src/views/plan/LessonContentPreviewPage/ContentArea.vue b/kolibri/plugins/coach/assets/src/views/plan/LessonContentPreviewPage/ContentArea.vue
index c04f055d10d..a5629ce327d 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/LessonContentPreviewPage/ContentArea.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/LessonContentPreviewPage/ContentArea.vue
@@ -1,12 +1,12 @@
 <template>
 
-  <section :style="{ backgroundColor: isExercise ? $themeTokens.surface : '' }">
+  <section>
     <h2 v-if="isExercise" class="header">
       {{ header }}
     </h2>
     <KContentRenderer
       v-if="content.available"
-      :class="{ hof: isExercise }"
+      class="content-renderer"
       :showCorrectAnswer="true"
       :itemId="selectedQuestion"
       :allowHints="false"
@@ -59,12 +59,8 @@
 
 <style lang="scss" scoped>
 
-  .content-area-exercise {
-    padding: 16px;
-  }
-
-  .hof {
-    overflow-x: hidden; // .solutionarea's negative margin oversteps
+  .content-renderer {
+    height: 100vh;
   }
 
   .header {
diff --git a/kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/LessonContentCard/BookmarkIcon.vue b/kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/LessonContentCard/BookmarkIcon.vue
index 9059cbe0845..8876153d1ed 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/LessonContentCard/BookmarkIcon.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/LessonContentCard/BookmarkIcon.vue
@@ -2,7 +2,7 @@
 
   <KIcon
     icon="bookmark"
-    style="top:50;left:75; width: 34px; height: 34px;"
+    style="top: 50px;left: 75px; width: 34px; height: 34px;"
   />
 
 </template>
diff --git a/kolibri/plugins/device/assets/src/composables/useDeviceRestart.js b/kolibri/plugins/device/assets/src/composables/useDeviceRestart.js
index 228e818d742..fef6561f4ce 100644
--- a/kolibri/plugins/device/assets/src/composables/useDeviceRestart.js
+++ b/kolibri/plugins/device/assets/src/composables/useDeviceRestart.js
@@ -3,7 +3,9 @@
  */
 
 import { ref } from 'kolibri.lib.vueCompositionApi';
+import heartbeat from 'kolibri.heartbeat';
 import client from 'kolibri.client';
+import clientFactory from 'kolibri.utils.clientFactory';
 import urls from 'kolibri.urls';
 import plugin_data from 'plugin_data';
 
@@ -11,6 +13,10 @@ import plugin_data from 'plugin_data';
 const restarting = ref(false);
 const canRestart = plugin_data.canRestart;
 
+// Use this for checking if the device is restarting to avoid triggering
+// the connection error detection.
+const baseClient = clientFactory();
+
 // POST to /api/device/devicerestart
 export function restartDevice() {
   return client({
@@ -20,7 +26,7 @@ export function restartDevice() {
 }
 
 export function isDeviceRestarting() {
-  return client({
+  return baseClient({
     url: urls['kolibri:core:devicerestart'](),
   })
     .then(resp => Boolean(resp.data))
@@ -32,6 +38,7 @@ function restart() {
     return Promise.reject('Device restart is not supported with current server configuration');
   }
   restarting.value = true;
+  heartbeat.stopPolling();
   let statusPromise = restartDevice();
   const checkStatus = expectedStatus => {
     return statusPromise.then(status => {
@@ -48,7 +55,8 @@ function restart() {
   // First wait for the device to be restarting
   return checkStatus(true).then(() => {
     // Then wait for it to have finished restarting
-    checkStatus(false).then(() => {
+    return checkStatus(false).then(() => {
+      heartbeat.startPolling();
       restarting.value = false;
     });
   });
diff --git a/kolibri/plugins/device/assets/src/modules/deviceInfo/index.js b/kolibri/plugins/device/assets/src/modules/deviceInfo/index.js
index 4115383364d..d6412d2b9f0 100644
--- a/kolibri/plugins/device/assets/src/modules/deviceInfo/index.js
+++ b/kolibri/plugins/device/assets/src/modules/deviceInfo/index.js
@@ -29,9 +29,6 @@ export default {
     getDataLoading(state) {
       return state.dataLoading;
     },
-    canRestart() {
-      return plugin_data.canRestart;
-    },
     isRemoteContent() {
       return plugin_data.isRemoteContent;
     },
diff --git a/kolibri/plugins/device/assets/src/views/DeviceSettingsPage/ServerRestartModal.vue b/kolibri/plugins/device/assets/src/views/DeviceSettingsPage/ServerRestartModal.vue
index 18a77af8936..1005e6b1d14 100644
--- a/kolibri/plugins/device/assets/src/views/DeviceSettingsPage/ServerRestartModal.vue
+++ b/kolibri/plugins/device/assets/src/views/DeviceSettingsPage/ServerRestartModal.vue
@@ -2,8 +2,8 @@
 
   <KModal
     :title="$tr('serverRestart')"
-    :submitText="coreString('continueAction')"
-    :cancelText="coreString('cancelAction')"
+    :submitText="restarting ? null : coreString('continueAction')"
+    :cancelText="restarting ? null : coreString('cancelAction')"
     @submit="handleSubmit"
     @cancel="$emit('cancel')"
   >
@@ -13,6 +13,11 @@
     <p class="description">
       {{ getMessage() }}
     </p>
+    <template v-if="restarting">
+      &nbsp;
+      <KCircularLoader />
+      &nbsp;
+    </template>
     <div v-if="changedSetting === 'add' && path.writable === true">
       <KCheckbox
         :checked="confirmationChecked"
@@ -37,13 +42,17 @@
     props: {
       changedSetting: {
         type: String, // primary, remove, add, plugins
-        required: true,
+        default: null,
       },
       path: {
         type: Object,
         required: false,
         default: null,
       },
+      restarting: {
+        type: Boolean,
+        default: false,
+      },
     },
     data() {
       return {
@@ -52,6 +61,9 @@
     },
     methods: {
       getMessage() {
+        if (!this.changedSetting) {
+          return this.$tr('serverRestartDescription');
+        }
         let message = '';
         switch (this.changedSetting) {
           case 'primary':
diff --git a/kolibri/plugins/device/assets/src/views/DeviceSettingsPage/api.js b/kolibri/plugins/device/assets/src/views/DeviceSettingsPage/api.js
index ce7bb4626a6..cb766c600ed 100644
--- a/kolibri/plugins/device/assets/src/views/DeviceSettingsPage/api.js
+++ b/kolibri/plugins/device/assets/src/views/DeviceSettingsPage/api.js
@@ -1,10 +1,15 @@
+import isEqual from 'lodash/isEqual';
+import pickBy from 'lodash/pickBy';
 import client from 'kolibri.client';
 import urls from 'kolibri.urls';
 
 const url = urls['kolibri:core:devicesettings']();
 
+const _dataCache = {};
+
 export function getDeviceSettings() {
   return client({ url }).then(({ data }) => {
+    Object.assign(_dataCache, data);
     return {
       languageId: data.language_id,
       landingPage: data.landing_page,
@@ -12,29 +17,44 @@ export function getDeviceSettings() {
       allowLearnerUnassignedResourceAccess: data.allow_learner_unassigned_resource_access,
       allowPeerUnlistedChannelImport: data.allow_peer_unlisted_channel_import,
       allowOtherBrowsersToConnect: data.allow_other_browsers_to_connect,
-      extraSettings: data.extra_settings,
+      extraSettings: {
+        // Destructure the extra_settings object
+        // to ensure we are returning a novel object
+        // from the one stored in the _dataCache
+        ...data.extra_settings,
+      },
       primaryStorageLocation: data.primary_storage_location,
-      secondaryStorageLocations: data.secondary_storage_locations,
+      // Spread the secondary storage locations array to ensure
+      // we are returning a novel array from the one stored in the _dataCache
+      secondaryStorageLocations: [...data.secondary_storage_locations],
     };
   });
 }
 
 // PATCH to /api/device/devicesettings with a new settings
 export function saveDeviceSettings(settings) {
+  const serverSettings = {
+    language_id: settings.languageId,
+    landing_page: settings.landingPage,
+    allow_guest_access: settings.allowGuestAccess,
+    allow_learner_unassigned_resource_access: settings.allowLearnerUnassignedResourceAccess,
+    allow_peer_unlisted_channel_import: settings.allowPeerUnlistedChannelImport,
+    allow_other_browsers_to_connect: settings.allowOtherBrowsersToConnect,
+    extra_settings: settings.extraSettings,
+    primary_storage_location: settings.primaryStorageLocation,
+    secondary_storage_locations: settings.secondaryStorageLocations,
+  };
+  const data = pickBy(serverSettings, (value, key) => !isEqual(value, _dataCache[key]));
+  if (Object.keys(data).length === 0) {
+    return Promise.resolve(false);
+  }
   return client({
     url,
     method: 'PATCH',
-    data: {
-      language_id: settings.languageId,
-      landing_page: settings.landingPage,
-      allow_guest_access: settings.allowGuestAccess,
-      allow_learner_unassigned_resource_access: settings.allowLearnerUnassignedResourceAccess,
-      allow_peer_unlisted_channel_import: settings.allowPeerUnlistedChannelImport,
-      allow_other_browsers_to_connect: settings.allowOtherBrowsersToConnect,
-      extra_settings: settings.extraSettings,
-      primary_storage_location: settings.primaryStorageLocation,
-      secondary_storage_locations: settings.secondaryStorageLocations,
-    },
+    data,
+  }).then(response => {
+    Object.assign(_dataCache, response.data); // Update the cache
+    return true;
   });
 }
 
diff --git a/kolibri/plugins/device/assets/src/views/DeviceSettingsPage/index.vue b/kolibri/plugins/device/assets/src/views/DeviceSettingsPage/index.vue
index 969a2eeaad3..d3da26db835 100644
--- a/kolibri/plugins/device/assets/src/views/DeviceSettingsPage/index.vue
+++ b/kolibri/plugins/device/assets/src/views/DeviceSettingsPage/index.vue
@@ -144,22 +144,22 @@
               :text="$tr('changeLocation')"
               :primary="true"
               appearance="basic-link"
-              :disabled="!multipleWritablePaths || isRemoteContent"
+              :disabled="!multipleWritablePaths || isRemoteContent || !canRestart"
               :class="{ 'disabled': !multipleWritablePaths }"
               @click="showChangePrimaryLocationModal = true"
             />
           </p>
           <KButton
-            v-if="browserLocationMatchesServerURL && (secondaryStorageLocations.length === 0)"
+            v-if="secondaryStorageLocations.length === 0"
             :text="$tr('addLocation')"
-            :disabled="isRemoteContent"
+            :disabled="isRemoteContent || !canRestart"
             appearance="raised-button"
             secondary
             @click="showAddStorageLocationModal = true"
           />
         </div>
 
-        <div v-show="browserLocationMatchesServerURL && (secondaryStorageLocations.length > 0)">
+        <div v-show="secondaryStorageLocations.length > 0">
           <h2>
             {{ $tr('secondaryStorage') }}
           </h2>
@@ -173,7 +173,7 @@
             hasDropdown
             secondary
             appearance="raised-button"
-            :disabled="isRemoteContent"
+            :disabled="isRemoteContent || !canRestart"
             :text="coreString('optionsLabel')"
           >
             <template #menu>
@@ -336,6 +336,11 @@
         @submit="handleServerRestart"
       />
 
+      <ServerRestartModal
+        v-if="restarting"
+        :restarting="true"
+      />
+
     </KPageContainer>
   </DeviceAppBarPage>
 
@@ -391,7 +396,7 @@
     },
     mixins: [commonCoreStrings, commonDeviceStrings],
     setup() {
-      const { restart } = useDeviceRestart();
+      const { canRestart, restart, restarting } = useDeviceRestart();
       const { plugins, fetchPlugins, togglePlugin } = usePlugins();
       const dataPlugins = ref(null);
 
@@ -419,7 +424,14 @@
         return !unchanged;
       }
 
-      return { restart, dataPlugins, checkPluginChanges, checkAndTogglePlugins };
+      return {
+        canRestart,
+        restart,
+        restarting,
+        dataPlugins,
+        checkPluginChanges,
+        checkAndTogglePlugins,
+      };
     },
     data() {
       return {
@@ -458,8 +470,8 @@
       };
     },
     computed: {
-      ...mapGetters(['isAppContext', 'isPageLoading']),
-      ...mapGetters('deviceInfo', ['canRestart', 'isRemoteContent']),
+      ...mapGetters(['isAppContext', 'isPageLoading', 'snackbarIsVisible']),
+      ...mapGetters('deviceInfo', ['isRemoteContent']),
       pageTitle() {
         return this.deviceString('deviceManagementTitle');
       },
@@ -488,12 +500,6 @@
       storageLocationOptions() {
         return [this.$tr('addStorageLocation'), this.$tr('removeStorageLocation')];
       },
-      browserLocationMatchesServerURL() {
-        return (
-          window.location.hostname.includes('127.0.0.1') ||
-          window.location.hostname.includes('localhost')
-        );
-      },
       notEnoughFreeSpace() {
         return this.freeSpace === 0;
       },
@@ -761,6 +767,8 @@
         } = this.getContentSettings();
         this.getExtraSettings();
 
+        const pluginsChanged = this.checkPluginChanges();
+
         this.checkAndTogglePlugins();
 
         this.saveDeviceSettings({
@@ -774,15 +782,36 @@
           secondaryStorageLocations: this.secondaryStorageLocations,
           primaryStorageLocation: this.primaryStorageLocation,
         })
-          .then(() => {
-            this.$store.dispatch('createSnackbar', this.$tr('saveSuccessNotification'));
-            this.showRestartModal = false;
-            if (this.restartSetting !== null) {
-              this.restart();
-              this.restartSetting = null;
+          .then(didSave => {
+            didSave = didSave || pluginsChanged;
+            if (didSave) {
+              this.$store.commit('CORE_CREATE_SNACKBAR', {
+                text: this.$tr('saveSuccessNotification'),
+                autoDismiss: true,
+                duration: 2000,
+              });
+              this.showRestartModal = false;
+              if (this.canRestart && this.restartSetting !== null) {
+                this.restartSetting = null;
+                return this.restart().then(() => didSave);
+              }
+            }
+            return didSave;
+          })
+          .then(shouldReload => {
+            if (shouldReload) {
+              if (this.snackbarIsVisible) {
+                const unwatch = this.$watch('snackbarIsVisible', () => {
+                  unwatch && unwatch();
+                  window.location.reload();
+                });
+              } else {
+                window.location.reload();
+              }
             }
           })
-          .catch(() => {
+          .catch(err => {
+            console.error(err);
             this.$store.dispatch('createSnackbar', this.$tr('saveFailureNotification'));
           });
       },
diff --git a/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue b/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue
index 6e6b94407fe..7c894beb031 100644
--- a/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue
+++ b/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue
@@ -40,7 +40,7 @@
             <template v-for="(facility, idx) in facilities">
               <tr
                 :key="idx"
-                style="border: none!important"
+                style="border: 0 !important"
               >
                 <td>
                   <FacilityNameAndSyncStatus
@@ -52,8 +52,7 @@
                   />
                 </td>
               </tr>
-              <!-- May cause error on device with > 10000 facilities... -->
-              <tr :key="idx + 10000">
+              <tr :key="idx + facilities.length">
                 <td style="padding: 0 0 16px 0;">
                   <!-- Gives most space possible to buttons and aligns them with text -->
                   <KButtonGroup style="margin-left: -16px; margin-right: -16px; max-width: 100%">
diff --git a/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue b/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue
index 33ac0fbdb4e..f6d8e7f3948 100644
--- a/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue
+++ b/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue
@@ -94,7 +94,8 @@
   import { updateTreeViewTopic } from '../../modules/wizard/handlers';
   import { getChannelWithContentSizes } from '../../modules/wizard/apiChannelMetadata';
   import NewChannelVersionBanner from '../ManageContentPage/NewChannelVersionBanner';
-  import { ContentWizardPages, ContentWizardErrors, PageNames } from '../../constants';
+  import { ContentWizardErrors, PageNames } from '../../constants';
+  import { availableChannelsPageLink } from '../ManageContentPage/manageContentLinks';
   import ChannelContentsSummary from './ChannelContentsSummary';
   import ContentTreeViewer from './ContentTreeViewer';
   import ContentWizardUiAlert from './ContentWizardUiAlert';
@@ -173,7 +174,14 @@
         return title;
       },
       backRoute() {
-        return { name: ContentWizardPages.AVAILABLE_CHANNELS };
+        if (this.inRemoteImportMode) {
+          return availableChannelsPageLink();
+        } else if (this.inPeerImportMode) {
+          return availableChannelsPageLink({ addressId: this.selectedPeer.id });
+        } else if (this.inLocalImportMode) {
+          return availableChannelsPageLink({ driveId: this.selectedDrive.id });
+        }
+        return availableChannelsPageLink();
       },
       channelId() {
         return this.$route.params.channel_id;
diff --git a/kolibri/plugins/html5_viewer/assets/src/views/Html5AppRendererIndex.vue b/kolibri/plugins/html5_viewer/assets/src/views/Html5AppRendererIndex.vue
index 832e3451e61..360eb517486 100644
--- a/kolibri/plugins/html5_viewer/assets/src/views/Html5AppRendererIndex.vue
+++ b/kolibri/plugins/html5_viewer/assets/src/views/Html5AppRendererIndex.vue
@@ -234,7 +234,6 @@
 
   @import '~kolibri-design-system/lib/styles/definitions';
   $frame-topbar-height: 37px;
-  $ui-toolbar-height: 56px;
 
   .fullscreen-header {
     text-align: right;
@@ -261,7 +260,7 @@
     @extend %momentum-scroll;
 
     width: 100%;
-    height: calc(100vh - #{$frame-topbar-height} - #{$ui-toolbar-height});
+    height: calc(100% - #{$frame-topbar-height});
     margin-bottom: -8px;
     overflow: hidden;
   }
diff --git a/kolibri/plugins/html5_viewer/kolibri_plugin.py b/kolibri/plugins/html5_viewer/kolibri_plugin.py
index 36f2f2e283d..be9b888afa7 100644
--- a/kolibri/plugins/html5_viewer/kolibri_plugin.py
+++ b/kolibri/plugins/html5_viewer/kolibri_plugin.py
@@ -16,4 +16,8 @@ class HTML5AppPlugin(KolibriPluginBase):
 @register_hook
 class HTML5AppAsset(content_hooks.ContentRendererHook):
     bundle_id = "main"
-    presets = (format_presets.HTML5_ZIP, format_presets.H5P_ZIP)
+    presets = (
+        format_presets.HTML5_ZIP,
+        format_presets.H5P_ZIP,
+        format_presets.IMSCP_ZIP,
+    )
diff --git a/kolibri/plugins/learn/assets/src/composables/__mocks__/useCardLayoutSpan.js b/kolibri/plugins/learn/assets/src/composables/__mocks__/useCardLayoutSpan.js
new file mode 100644
index 00000000000..8cfd97c797c
--- /dev/null
+++ b/kolibri/plugins/learn/assets/src/composables/__mocks__/useCardLayoutSpan.js
@@ -0,0 +1,46 @@
+/**
+ * `useCardLayoutSpan` composable function mock.
+ *
+ * If default values are sufficient for tests,
+ * you only need call `jest.mock('<useCardLayoutSpan file path>')`
+ * at the top of a test file.
+ *
+ * If you need to override some default values from some tests,
+ * you can import a helper function `useCardLayoutSpanMock` that accepts
+ * an object with values to be overriden and use it together
+ * with  `mockImplementation` as follows:
+ *
+ * ```
+ * // eslint-disable-next-line import/named
+ * import useCardLayoutSpan, { useCardLayoutSpanMock } from '<useCardLayoutSpan file path>';
+ *
+ * jest.mock('<useCardLayoutSpan file path>')
+ *
+ * it('test', () => {
+ *   useCardLayoutSpan.mockImplementation(
+ *    () => useCardLayoutSpanMock({})
+ *   );
+ * })
+ * ```
+ *
+ * You can reset your mock implementation back to default values
+ * for other tests by calling the following in `beforeEach`:
+ *
+ * ```
+ * useCardLayoutSpan.mockImplementation(() => useCardLayoutSpanMock())
+ * ```
+ */
+
+const MOCK_DEFAULTS = {
+  layoutSpan: 4,
+  makeComputedCardCount: jest.fn(() => 4),
+};
+
+export function useCardLayoutSpanMock(overrides = {}) {
+  return {
+    ...MOCK_DEFAULTS,
+    ...overrides,
+  };
+}
+
+export default jest.fn(() => useCardLayoutSpanMock());
diff --git a/kolibri/plugins/learn/assets/src/composables/__mocks__/useContentLink.js b/kolibri/plugins/learn/assets/src/composables/__mocks__/useContentLink.js
index 424b9b86fd1..be828bc458d 100644
--- a/kolibri/plugins/learn/assets/src/composables/__mocks__/useContentLink.js
+++ b/kolibri/plugins/learn/assets/src/composables/__mocks__/useContentLink.js
@@ -34,6 +34,10 @@
 const MOCK_DEFAULTS = {
   genContentLinkBackLinkCurrentPage: jest.fn(() => ({})),
   genContentLinkKeepCurrentBackLink: jest.fn(() => ({})),
+  genExternalContentURLBackLinkCurrentPage: jest.fn(() => ({})),
+  genExternalBackURL: jest.fn(() => ({})),
+  genLibraryPageBackLink: jest.fn(() => ({})),
+  genExploreLibrariesPageBackLink: jest.fn(() => ({})),
   back: {},
 };
 
diff --git a/kolibri/plugins/learn/assets/src/composables/__mocks__/useDevices.js b/kolibri/plugins/learn/assets/src/composables/__mocks__/useDevices.js
index a8fdb132d50..c1af4091022 100644
--- a/kolibri/plugins/learn/assets/src/composables/__mocks__/useDevices.js
+++ b/kolibri/plugins/learn/assets/src/composables/__mocks__/useDevices.js
@@ -31,9 +31,17 @@
  * ```
  */
 
+import { ref } from 'kolibri.lib.vueCompositionApi';
+
 const MOCK_DEFAULTS = {
   fetchDevices: jest.fn(() => Promise.resolve([])),
   baseurl: null,
+  deviceChannelsMap: ref({}),
+  networkDevices: ref({}),
+  networkDevicesWithChannels: ref([]),
+  keepDeviceChannelsUpdated: jest.fn(),
+  isLoadingChannels: false,
+  isLoading: false,
 };
 
 export function useDevicesMock(overrides = {}) {
@@ -43,6 +51,14 @@ export function useDevicesMock(overrides = {}) {
   };
 }
 
+const DEVICE_DATA_DEFAULTS = {
+  baseurl: 'http://test-device',
+  deviceName: 'test-device',
+  instanceId: '1234',
+};
+
+export const currentDeviceData = jest.fn(() => DEVICE_DATA_DEFAULTS);
+
 export default jest.fn(() => useDevicesMock());
 
 export const setCurrentDevice = jest.fn(id =>
diff --git a/kolibri/plugins/learn/assets/src/composables/__mocks__/useDownloadRequests.js b/kolibri/plugins/learn/assets/src/composables/__mocks__/useDownloadRequests.js
index 2e2012b68f9..a6d25380604 100644
--- a/kolibri/plugins/learn/assets/src/composables/__mocks__/useDownloadRequests.js
+++ b/kolibri/plugins/learn/assets/src/composables/__mocks__/useDownloadRequests.js
@@ -35,13 +35,11 @@ const MOCK_DEFAULTS = {
   downloadRequestsTranslator: {
     $tr: jest.fn(),
   },
-  downloadRequestMap: {
-    downloads: {},
-  },
-  isDownloadedByLearner: jest.fn(),
-  isDownloadingByLearner: jest.fn(),
+  downloadRequestMap: {},
   addDownloadRequest: jest.fn(),
   fetchUserDownloadRequests: jest.fn(() => Promise.resolve([])),
+  pollUserDownloadRequests: jest.fn(),
+  loading: false,
 };
 
 export function useDownloadRequestsMock(overrides = {}) {
diff --git a/kolibri/plugins/learn/assets/src/composables/__mocks__/usePinnedDevices.js b/kolibri/plugins/learn/assets/src/composables/__mocks__/usePinnedDevices.js
index 6b2a8e4d3d6..f3dfb121c04 100644
--- a/kolibri/plugins/learn/assets/src/composables/__mocks__/usePinnedDevices.js
+++ b/kolibri/plugins/learn/assets/src/composables/__mocks__/usePinnedDevices.js
@@ -32,9 +32,13 @@
  */
 
 const MOCK_DEFAULTS = {
-  createPinForUser: jest.fn(() => Promise.resolve({})),
-  deletePinForUser: jest.fn(() => Promise.resolve({})),
   fetchPinsForUser: jest.fn(() => Promise.resolve([])),
+  pinnedDevices: [],
+  pinnedDevicesExist: false,
+  unpinnedDevices: [],
+  unpinnedDevicesExist: false,
+  handlePinToggle: jest.fn(() => Promise.resolve({})),
+  userPinsMap: {},
 };
 
 export function usePinnedDevicesMock(overrides = {}) {
diff --git a/kolibri/plugins/learn/assets/src/composables/useCardLayoutSpan.js b/kolibri/plugins/learn/assets/src/composables/useCardLayoutSpan.js
new file mode 100644
index 00000000000..79bfb983afb
--- /dev/null
+++ b/kolibri/plugins/learn/assets/src/composables/useCardLayoutSpan.js
@@ -0,0 +1,60 @@
+import { get } from '@vueuse/core';
+import useKResponsiveWindow from 'kolibri.coreVue.composables.useKResponsiveWindow';
+import { computed } from 'kolibri.lib.vueCompositionApi';
+
+export default function useCardLayoutSpan() {
+  const { windowBreakpoint, windowIsSmall } = useKResponsiveWindow();
+  const cardsPerRow = computed(() => {
+    if (get(windowIsSmall)) {
+      return 1;
+    }
+    if (get(windowBreakpoint) < 5) {
+      return 2;
+    }
+    if (get(windowBreakpoint) < 6) {
+      return 3;
+    }
+    return 4;
+  });
+  const layoutSpan = computed(() => {
+    /**
+     * The breakpoints below represent the window widths
+     * 0: < 480px  | Small screen  | 4 columns
+     * 1: < 600px  | Small screen  | 4 columns
+     * 2: < 840px  | Medium screen | 8 columns
+     * 3: < 960px  | Large screen  | 12 columns
+     * 4: < 1280px | Large screen  | 12 columns
+     * 5: < 1440px | Large screen  | 12 columns
+     * 6: < 1600px | Large screen  | 12 columns
+     * 7: > 1600px | Large screen  | 12 columns
+     *
+     * On resize, display X cards per row where:
+     * X = total columns in grid / column span for each card.
+     * For example, if the total number of columns is 12, and
+     * column span for each cards is 4, then X is 3.
+     */
+    if (get(windowBreakpoint) < 2) {
+      return 4 / get(cardsPerRow);
+    }
+    if (get(windowBreakpoint) === 2) {
+      return 8 / get(cardsPerRow);
+    }
+    return 12 / get(cardsPerRow);
+  });
+
+  function makeComputedCardCount(rows, minCards) {
+    // We want to display the number of rows specified by rows,
+    // but always display at least minCards cards, if available.
+    return computed(() => {
+      const numCards = Math.max(get(cardsPerRow) * rows, minCards);
+      // Now to make sure we don't display incomplete rows, we round this number up
+      // to the nearest multiple of cardsPerRow
+      return Math.ceil(numCards / get(cardsPerRow)) * get(cardsPerRow);
+    });
+  }
+
+  return {
+    layoutSpan,
+    makeComputedCardCount,
+  };
+}
diff --git a/kolibri/plugins/learn/assets/src/composables/useContentLink.js b/kolibri/plugins/learn/assets/src/composables/useContentLink.js
index 6ff02b45e28..520a90e653a 100644
--- a/kolibri/plugins/learn/assets/src/composables/useContentLink.js
+++ b/kolibri/plugins/learn/assets/src/composables/useContentLink.js
@@ -4,6 +4,10 @@ import pick from 'lodash/pick';
 import { computed, getCurrentInstance } from 'kolibri.lib.vueCompositionApi';
 import { ExternalPagePaths, PageNames } from '../constants';
 
+function _decodeBackLinkQuery(query) {
+  return query && query.prevQuery ? JSON.parse(decodeURI(query.prevQuery)) : {};
+}
+
 export default function useContentLink(store) {
   // Get store reference from the curent instance
   // but allow it to be passed in to allow for dependency
@@ -11,7 +15,7 @@ export default function useContentLink(store) {
   store = store || getCurrentInstance().proxy.$store;
   const route = computed(() => store.state.route);
 
-  function _makeLink(id, isResource, query, deviceId) {
+  function _makeNodeLink(id, isResource, query, deviceId) {
     const params = get(route).params;
     return {
       name: isResource ? PageNames.TOPICS_CONTENT : PageNames.TOPICS_TOPIC,
@@ -20,6 +24,21 @@ export default function useContentLink(store) {
     };
   }
 
+  function _getBackLinkQuery() {
+    const oldQuery = get(route).query || {};
+    const query = {
+      prevName: get(route).name,
+    };
+    if (!isEmpty(oldQuery)) {
+      query.prevQuery = encodeURI(JSON.stringify(oldQuery));
+    }
+    const params = get(route).params;
+    if (!isEmpty(params)) {
+      query.prevParams = encodeURI(JSON.stringify(params));
+    }
+    return query;
+  }
+
   /**
    * A function to generate a VueRouter link object that links to
    * either a resource or a topic, and generates query parameters
@@ -33,18 +52,10 @@ export default function useContentLink(store) {
     if (!route) {
       return null;
     }
-    const oldQuery = get(route).query || {};
-    const query = {
-      prevName: get(route).name,
-    };
-    if (!isEmpty(oldQuery)) {
-      query.prevQuery = encodeURI(JSON.stringify(oldQuery));
-    }
-    const params = get(route).params;
-    if (!isEmpty(params)) {
-      query.prevParams = encodeURI(JSON.stringify(params));
-    }
-    return _makeLink(id, isResource, query, deviceId);
+
+    const query = _getBackLinkQuery();
+
+    return _makeNodeLink(id, isResource, query, deviceId);
   }
 
   function genExternalContentURLBackLinkCurrentPage(id) {
@@ -54,17 +65,9 @@ export default function useContentLink(store) {
     if (!route) {
       return base;
     }
-    const oldQuery = get(route).query || {};
-    const query = {
-      prevName: get(route).name,
-    };
-    if (!isEmpty(oldQuery)) {
-      query.prevQuery = encodeURI(JSON.stringify(oldQuery));
-    }
-    const params = get(route).params;
-    if (!isEmpty(params)) {
-      query.prevParams = encodeURI(JSON.stringify(params));
-    }
+
+    const query = _getBackLinkQuery();
+
     const path = `/topics/c/${id}`;
 
     return `${base}${path}?${new URLSearchParams(query)}`;
@@ -89,7 +92,28 @@ export default function useContentLink(store) {
     const oldQuery = get(route).query || {};
     const query = pick(oldQuery, ['prevName', 'prevQuery', 'prevParams']);
 
-    return _makeLink(id, isResource, query, deviceId);
+    return _makeNodeLink(id, isResource, query, deviceId);
+  }
+
+  /**
+   * A function to generate a VueRouter link object that links to
+   * a topic, and decodes previous query parameters
+   * created by generateContentBackLinkCurrentPage if they exist,
+   * allowing e.g. a resource page to link to a topic page
+   * while maintaining the conceptual model of a single immersive overlay
+   * that can be closed out, returning to the originating page that linked
+   * to the original parent topic of the resource.
+   * @param {string} id - the id of the node
+   * @return {Object} VueRouter link object
+   */
+  function genContentLinkKeepPreviousBackLink(id, deviceId) {
+    if (!route) {
+      return null;
+    }
+    const oldQuery = _decodeBackLinkQuery(get(route).query);
+    const query = pick(oldQuery, ['prevName', 'prevQuery', 'prevParams']);
+
+    return _makeNodeLink(id, false, query, deviceId);
   }
 
   const back = computed(() => {
@@ -97,10 +121,7 @@ export default function useContentLink(store) {
     if (!routeValue) {
       return null;
     }
-    const query =
-      routeValue.query && routeValue.query.prevQuery
-        ? JSON.parse(decodeURI(routeValue.query.prevQuery))
-        : {};
+    const query = _decodeBackLinkQuery(routeValue.query);
     const name = (routeValue.query || {}).prevName || PageNames.HOME;
     const params =
       routeValue.query && routeValue.query.prevParams
@@ -126,25 +147,28 @@ export default function useContentLink(store) {
     return `${base}${path}${query}`;
   }
 
-  function genLibraryPageBackLink(deviceId, isExploreLibraries = false) {
+  function genLibraryPageBackLink(deviceId) {
     if (!route) {
       return null;
     }
 
-    const oldQuery = get(route).query || {};
-    const query = {
-      prevName: get(route).name,
+    const query = _getBackLinkQuery();
+    return {
+      name: PageNames.LIBRARY,
+      params: { deviceId },
+      query,
     };
-    if (!isEmpty(oldQuery)) {
-      query.prevQuery = encodeURI(JSON.stringify(oldQuery));
-    }
-    const params = get(route).params;
-    if (!isEmpty(params)) {
-      query.prevParams = encodeURI(JSON.stringify(params));
+  }
+
+  function genExploreLibrariesPageBackLink() {
+    if (!route) {
+      return null;
     }
+
+    const query = _getBackLinkQuery();
+
     return {
-      name: isExploreLibraries ? PageNames.EXPLORE_LIBRARIES : PageNames.LIBRARY,
-      params: pick({ deviceId: deviceId || params.deviceId }, ['deviceId']),
+      name: PageNames.EXPLORE_LIBRARIES,
       query,
     };
   }
@@ -152,9 +176,11 @@ export default function useContentLink(store) {
   return {
     genContentLinkBackLinkCurrentPage,
     genContentLinkKeepCurrentBackLink,
+    genContentLinkKeepPreviousBackLink,
     genExternalContentURLBackLinkCurrentPage,
     genExternalBackURL,
     genLibraryPageBackLink,
+    genExploreLibrariesPageBackLink,
     back,
   };
 }
diff --git a/kolibri/plugins/learn/assets/src/composables/useDevices.js b/kolibri/plugins/learn/assets/src/composables/useDevices.js
index 39d15747b73..186afaecff3 100644
--- a/kolibri/plugins/learn/assets/src/composables/useDevices.js
+++ b/kolibri/plugins/learn/assets/src/composables/useDevices.js
@@ -2,14 +2,22 @@
  * A composable function containing logic related to channels
  */
 
-import { computed, getCurrentInstance, ref } from 'kolibri.lib.vueCompositionApi';
+import {
+  computed,
+  getCurrentInstance,
+  ref,
+  onBeforeUnmount,
+  watch,
+} from 'kolibri.lib.vueCompositionApi';
 import { NetworkLocationResource, RemoteChannelResource } from 'kolibri.resources';
-import { get, set } from '@vueuse/core';
+import { get, set, useTimeoutPoll } from '@vueuse/core';
 import useMinimumKolibriVersion from 'kolibri.coreVue.composables.useMinimumKolibriVersion';
 import useUser from 'kolibri.coreVue.composables.useUser';
+import { localeCompare } from 'kolibri.utils.i18n';
 import plugin_data from 'plugin_data';
 import { KolibriStudioId } from '../constants';
 import { learnStrings } from '../views/commonLearnStrings';
+import useChannels from './useChannels';
 
 /**
  * The ref is defined in the outer scope so it can be used as a shared store
@@ -27,7 +35,7 @@ const KolibriStudioDeviceData = {
 
 const { isMinimumKolibriVersion } = useMinimumKolibriVersion(0, 16, 0);
 
-const { isLearnerOnlyImport, canManageContent } = useUser();
+const { isLearnerOnlyImport, canManageContent, isUserLoggedIn } = useUser();
 
 function canAccessStudio() {
   return !get(isLearnerOnlyImport) && get(canManageContent);
@@ -86,7 +94,7 @@ function computedDevice(routingDeviceId, callback) {
   });
 }
 
-export default function useDevices(store) {
+export function currentDeviceData(store) {
   store = store || getCurrentInstance().proxy.$store;
   const route = computed(() => store && store.state.route);
   const routingDeviceId = computed(() => {
@@ -98,11 +106,116 @@ export default function useDevices(store) {
   const baseurl = computedDevice(routingDeviceId, device => device.base_url);
   const deviceName = computedDevice(routingDeviceId, device => device.device_name);
 
+  return {
+    instanceId,
+    baseurl,
+    deviceName,
+  };
+}
+
+export default function useDevices(store) {
+  const { fetchChannels } = useChannels();
+  const networkDevices = ref({});
+  const isLoading = ref(false);
+  const { instanceId, baseurl, deviceName } = currentDeviceData(store);
+
+  const deviceChannelsMap = ref({});
+  const isLoadingChannels = ref(true);
+
+  function _updateDeviceChannels(device, channels) {
+    set(deviceChannelsMap, {
+      ...get(deviceChannelsMap),
+      [device.instance_id]: channels,
+    });
+  }
+
+  function loadDeviceChannels() {
+    const promises = [];
+    // Clear out the device channels map when data refreshes
+    // to remove stale channel fetches.
+    const newDeviceChannelsMap = {};
+    for (const currentDevice of Object.values(networkDevices.value)) {
+      if (!get(deviceChannelsMap)[currentDevice.instance_id]) {
+        const baseurl = currentDevice.base_url;
+        const promise = fetchChannels({ baseurl })
+          .then(channels => {
+            _updateDeviceChannels(currentDevice, channels);
+            isLoadingChannels.value = false;
+          })
+          .catch(() => {
+            // If we fail to fetch channels, set the channels to an empty array
+            // to avoid repeatedly polling devices that are returning an error
+            // code.
+            _updateDeviceChannels(currentDevice, []);
+          });
+        promises.push(promise);
+      } else {
+        newDeviceChannelsMap[currentDevice.instance_id] = get(deviceChannelsMap)[
+          currentDevice.instance_id
+        ];
+      }
+    }
+    set(deviceChannelsMap, newDeviceChannelsMap);
+    Promise.all(promises).then(() => {
+      // In case we don't successfully fetch any channels, don't do a perpetual loading state.
+      isLoadingChannels.value = false;
+    });
+  }
+
+  async function setNetworkDevices() {
+    isLoading.value = true;
+    const newNetworkDevices = {};
+    const devices = await fetchDevices();
+    for (const device of devices) {
+      if (device['available']) {
+        newNetworkDevices[device.instance_id] = device;
+      }
+    }
+    networkDevices.value = newNetworkDevices;
+    isLoading.value = false;
+  }
+
+  // Start polling
+  if (get(isUserLoggedIn)) {
+    const fetch = useTimeoutPoll(setNetworkDevices, 5000, { immediate: true });
+    // Stop polling
+    onBeforeUnmount(() => {
+      fetch.pause();
+    });
+  }
+
+  function keepDeviceChannelsUpdated() {
+    if (get(isUserLoggedIn)) {
+      loadDeviceChannels();
+      watch(networkDevices, loadDeviceChannels);
+    }
+  }
+
+  const networkDevicesWithChannels = computed(() => {
+    return Object.values(get(networkDevices))
+      .filter(device => get(deviceChannelsMap)[device.instance_id]?.length > 0)
+      .sort((a, b) => {
+        if (a.instance_id === KolibriStudioId) {
+          return -1;
+        }
+        if (b.instance_id === KolibriStudioId) {
+          return 1;
+        }
+        return localeCompare(a.device_name, b.device_name);
+      });
+  });
+
   return {
     fetchDevices,
+    deviceChannelsMap,
+    keepDeviceChannelsUpdated,
+    isLoadingChannels,
+    isLoading,
     setCurrentDevice,
     instanceId,
     baseurl,
     deviceName,
+    networkDevices,
+    networkDevicesWithChannels,
   };
 }
diff --git a/kolibri/plugins/learn/assets/src/composables/useDownloadRequests.js b/kolibri/plugins/learn/assets/src/composables/useDownloadRequests.js
index 03924ed5b93..6229cc9a5eb 100644
--- a/kolibri/plugins/learn/assets/src/composables/useDownloadRequests.js
+++ b/kolibri/plugins/learn/assets/src/composables/useDownloadRequests.js
@@ -2,7 +2,7 @@
  * A composable function containing logic related to download requests
  */
 
-import { getCurrentInstance, reactive, ref } from 'kolibri.lib.vueCompositionApi';
+import { getCurrentInstance, onBeforeUnmount, reactive, ref } from 'kolibri.lib.vueCompositionApi';
 import { ContentRequestResource } from 'kolibri.resources';
 import { createTranslator } from 'kolibri.utils.i18n';
 import { get, set } from '@vueuse/core';
@@ -10,7 +10,7 @@ import redirectBrowser from 'kolibri.utils.redirectBrowser';
 import urls from 'kolibri.urls';
 import client from 'kolibri.client';
 import Vue from 'kolibri.lib.vue';
-import useDevices from './useDevices';
+import { currentDeviceData } from '../composables/useDevices';
 
 const downloadRequestsTranslator = createTranslator('DownloadRequests', {
   downloadStartedLabel: {
@@ -35,19 +35,66 @@ const availableSpace = ref(0);
 export default function useDownloadRequests(store) {
   store = store || getCurrentInstance().proxy.$store;
 
-  const { instanceId } = useDevices(store);
+  const { instanceId } = currentDeviceData(store);
 
   function fetchUserDownloadRequests(params) {
-    return ContentRequestResource.list(params)
-      .then(downloadRequests => {
-        for (const obj of downloadRequests) {
-          set(downloadRequestMap, obj.id, obj);
-        }
-        set(loading, false);
-      })
-      .then(store.dispatch('notLoading'));
+    return ContentRequestResource.list(params).then(downloadRequests => {
+      if (downloadRequests.results) {
+        downloadRequests = downloadRequests.results;
+      }
+      for (const obj of downloadRequests) {
+        set(downloadRequestMap, obj.contentnode_id, obj);
+      }
+      store.dispatch('notLoading');
+      set(loading, false);
+      return downloadRequests;
+    });
   }
 
+  const defaultPollingInterval = 30000; // Default interval of 30 seconds
+
+  const calculatePollingInterval = () => {
+    return Object.values(downloadRequestMap).reduce((interval, download) => {
+      let pollingInterval = defaultPollingInterval;
+      if (download.status === 'PENDING' || download.status === 'FAILED') {
+        pollingInterval = 5000; // Poll every 5 seconds
+      } else if (download.status === 'IN_PROGRESS') {
+        pollingInterval = 1000; // Poll every 1 second
+      }
+      return Math.min(interval, pollingInterval);
+    }, defaultPollingInterval);
+  };
+
+  let poller;
+
+  const pollingParams = ref({});
+
+  const pollRequests = () => {
+    poller = setTimeout(() => {
+      fetchUserDownloadRequests(get(pollingParams)).then(() => {
+        pollRequests();
+      });
+    }, calculatePollingInterval());
+  };
+
+  const clearPolling = () => {
+    clearTimeout(poller);
+  };
+
+  const restartPolling = () => {
+    if (poller) {
+      clearPolling();
+      pollRequests();
+    }
+  };
+
+  const pollUserDownloadRequests = params => {
+    set(pollingParams, params);
+    fetchUserDownloadRequests(get(pollingParams)).then(() => {
+      pollRequests();
+    });
+  };
+
   function fetchAvailableFreespace() {
     const loading = ref(true);
     const freespace = 0;
@@ -67,24 +114,26 @@ export default function useDownloadRequests(store) {
     redirectBrowser(urls['kolibri:kolibri.plugins.learn:my_downloads']());
   }
 
-  function addDownloadRequest(content) {
+  function addDownloadRequest(contentNode) {
     const metadata = {
-      title: content.title,
-      file_size: content.files.reduce((size, f) => size + f.file_size, 0),
-      learning_activities: content.learning_activities,
+      title: contentNode.title,
+      file_size: contentNode.files.reduce((size, f) => size + f.file_size, 0),
+      learning_activities: contentNode.learning_activities,
     };
     const data = {
-      contentnode_id: content.id,
+      contentnode_id: contentNode.id,
       metadata,
       source_id: store.getters.currentUserId,
       source_instance_id: get(instanceId),
-      reason: 'UserInitiated',
+      reason: 'USER_INITIATED',
       facility: store.getters.currentFacilityId,
-      status: 'Pending',
+      status: 'PENDING',
       date_added: new Date(),
     };
+    set(downloadRequestMap, contentNode.id, data);
     ContentRequestResource.create(data).then(downloadRequest => {
-      set(downloadRequestMap, downloadRequest.node_id, downloadRequest);
+      set(downloadRequestMap, downloadRequest.contentnode_id, downloadRequest);
+      restartPolling();
     });
 
     store.commit('CORE_CREATE_SNACKBAR', {
@@ -98,33 +147,31 @@ export default function useDownloadRequests(store) {
     return Promise.resolve();
   }
 
-  function removeDownloadRequest(content) {
+  function removeDownloadRequest(contentNodeId) {
+    const contentRequest = downloadRequestMap[contentNodeId];
+    if (!contentRequest) {
+      return Promise.resolve();
+    }
     ContentRequestResource.deleteModel({
-      id: content.id,
-      contentnode_id: content.contentnode_id,
+      id: contentRequest.id,
+    });
+    Vue.delete(downloadRequestMap, contentRequest.contentnode_id);
+    store.commit('CORE_CREATE_SNACKBAR', {
+      text: downloadRequestsTranslator.$tr('resourceRemoved'),
+      backdrop: false,
+      forceReuse: true,
+      autoDismiss: true,
     });
-    Vue.delete(downloadRequestMap, content.id);
     return Promise.resolve();
   }
 
-  function isDownloadingByLearner(content) {
-    if (!content || !content.id) {
-      return false;
-    }
-    const downloadRequest = downloadRequestMap[this.content.id];
-    return Boolean(downloadRequest && !downloadRequest.status === 'COMPLETED');
-  }
-
-  function isDownloadedByLearner(content) {
-    if (!content || !content.id) {
-      return false;
-    }
-    const downloadRequest = downloadRequestMap[this.content.id];
-    return Boolean(downloadRequest && downloadRequest.status === 'COMPLETED');
-  }
+  onBeforeUnmount(() => {
+    clearPolling();
+  });
 
   return {
     fetchUserDownloadRequests,
+    pollUserDownloadRequests,
     fetchAvailableFreespace,
     availableSpace,
     downloadRequestMap,
@@ -132,7 +179,5 @@ export default function useDownloadRequests(store) {
     loading,
     removeDownloadRequest,
     downloadRequestsTranslator,
-    isDownloadingByLearner,
-    isDownloadedByLearner,
   };
 }
diff --git a/kolibri/plugins/learn/assets/src/composables/usePinnedDevices.js b/kolibri/plugins/learn/assets/src/composables/usePinnedDevices.js
index aa461dcc83e..c7e5b926f82 100644
--- a/kolibri/plugins/learn/assets/src/composables/usePinnedDevices.js
+++ b/kolibri/plugins/learn/assets/src/composables/usePinnedDevices.js
@@ -2,27 +2,88 @@
  * A composable function containing logic related to pinned devices
  */
 
-import { getCurrentInstance } from 'kolibri.lib.vueCompositionApi';
+import { get, set } from '@vueuse/core';
+import { computed, getCurrentInstance, ref } from 'kolibri.lib.vueCompositionApi';
 import { PinnedDeviceResource } from 'kolibri.resources';
+import { crossComponentTranslator } from 'kolibri.utils.i18n';
+import { KolibriStudioId } from '../constants';
+import LibraryItem from '../views/ExploreLibrariesPage/LibraryItem';
 
-export default function usePinnedDevices() {
-  const $store = getCurrentInstance().proxy.$store;
-  const user = $store.state.core.session.user_id;
+const PinStrings = crossComponentTranslator(LibraryItem);
+
+export default function usePinnedDevices(networkDevicesWithChannels, store) {
+  store = store || getCurrentInstance().proxy.$store;
+  const userPinsMap = ref({});
+
+  const devicesWithChannels = computed(() => {
+    return networkDevicesWithChannels ? get(networkDevicesWithChannels) || [] : [];
+  });
 
   function fetchPinsForUser() {
-    return PinnedDeviceResource.fetchCollection({ force: true });
+    return PinnedDeviceResource.fetchCollection({ force: true }).then(pins => {
+      const updatedPins = {};
+      for (const pin of pins) {
+        updatedPins[pin.instance_id] = pin;
+      }
+      set(userPinsMap, updatedPins);
+    });
   }
 
   function createPinForUser(instance_id) {
-    return PinnedDeviceResource.create({ instance_id, user });
+    set(userPinsMap, {
+      ...get(userPinsMap),
+      [instance_id]: { instance_id },
+    });
+    store.dispatch('createSnackbar', PinStrings.$tr('pinnedTo'));
+    return PinnedDeviceResource.create({ instance_id }).then(pin => {
+      set(userPinsMap, {
+        ...get(userPinsMap),
+        [pin.instance_id]: pin,
+      });
+    });
+  }
+
+  function deletePinForUser(instance_id) {
+    const map = get(userPinsMap);
+    const id = map[instance_id].id;
+    const newMap = { ...map };
+    delete newMap[instance_id];
+    set(userPinsMap, newMap);
+    store.dispatch('createSnackbar', PinStrings.$tr('pinRemoved'));
+    return PinnedDeviceResource.deleteModel({ id });
   }
 
-  function deletePinForUser(id) {
-    return PinnedDeviceResource.deleteModel(id, { user });
+  function _isPinnedDevice(device) {
+    return get(userPinsMap)[device.instance_id] || device.instance_id === KolibriStudioId;
   }
+
+  const pinnedDevices = computed(() => {
+    return get(devicesWithChannels).filter(_isPinnedDevice);
+  });
+  const pinnedDevicesExist = computed(() => {
+    return get(pinnedDevices).length > 0;
+  });
+  const unpinnedDevices = computed(() => {
+    return get(devicesWithChannels).filter(d => !_isPinnedDevice(d));
+  });
+  const unpinnedDevicesExist = computed(() => {
+    return get(unpinnedDevices).length > 0;
+  });
+
+  function handlePinToggle(instance_id) {
+    if (get(userPinsMap)[instance_id]) {
+      return deletePinForUser(instance_id);
+    }
+    return createPinForUser(instance_id);
+  }
+
   return {
-    createPinForUser,
-    deletePinForUser,
+    handlePinToggle,
     fetchPinsForUser,
+    userPinsMap,
+    pinnedDevices,
+    pinnedDevicesExist,
+    unpinnedDevices,
+    unpinnedDevicesExist,
   };
 }
diff --git a/kolibri/plugins/learn/assets/src/composables/useSearch.js b/kolibri/plugins/learn/assets/src/composables/useSearch.js
index 1453f4b8156..6e9f441b24a 100644
--- a/kolibri/plugins/learn/assets/src/composables/useSearch.js
+++ b/kolibri/plugins/learn/assets/src/composables/useSearch.js
@@ -21,8 +21,8 @@ import {
   ResourcesNeededTypes,
 } from 'kolibri.coreVue.vuex.constants';
 import { deduplicateResources } from '../utils/contentNode';
+import { currentDeviceData } from './useDevices';
 import useContentNodeProgress from './useContentNodeProgress';
-import useDevices from './useDevices';
 import { setLanguages } from './useLanguages';
 
 export const logging = logger.getLogger(__filename);
@@ -158,7 +158,7 @@ export default function useSearch(descendant, store, router) {
   const more = ref(null);
   const labels = ref(null);
 
-  const { baseurl } = useDevices(store);
+  const { baseurl } = currentDeviceData(store);
 
   const searchTerms = computed({
     get() {
diff --git a/kolibri/plugins/learn/assets/src/my_downloads/views/DownloadsList/index.vue b/kolibri/plugins/learn/assets/src/my_downloads/views/DownloadsList/index.vue
index 1211e6274a8..765f8cc03d8 100644
--- a/kolibri/plugins/learn/assets/src/my_downloads/views/DownloadsList/index.vue
+++ b/kolibri/plugins/learn/assets/src/my_downloads/views/DownloadsList/index.vue
@@ -6,7 +6,7 @@
       v-model="currentPage"
       :itemsPerPage="itemsPerPage"
       :totalPageNumber="totalPageNumber"
-      :numFilteredItems="downloads.length"
+      :numFilteredItems="downloadItemListLength"
     >
       <CoreTable>
         <template #headers>
@@ -16,26 +16,34 @@
               class="select-all"
               :label="coreString('nameLabel')"
               :checked="areAllSelected"
+              :indeterminate="areAnySelected && !areAllSelected"
               :disabled="!areAnyAvailable"
               :style="{ color: $themeTokens.annotation }"
               @change="selectAll($event)"
             />
           </th>
-          <th> {{ coreString('fileSize') }} </th>
-          <th> {{ coreString('dateAdded') }} </th>
+          <th v-if="windowIsLarge">
+            {{ coreString('fileSize') }}
+          </th>
+          <th v-if="windowIsLarge">
+            {{ coreString('dateAdded') }}
+          </th>
+          <th v-if="windowIsLarge">
+            {{ coreString('statusLabel') }}
+          </th>
         </template>
         <template #tbody>
-          <tbody v-if="!loading && downloadRequestMap">
+          <tbody v-if="!loading">
             <tr
               v-for="download in paginatedDownloads"
               :key="download.contentnode_id"
               :style="download.status !== 'COMPLETED' ? { color: $themeTokens.annotation } : {}"
             >
-              <td>
+              <td :class="{ 'small-resource-details': !windowIsLarge }">
                 <KCheckbox
-                  :checked="resourceIsSelected(download)"
+                  :checked="Boolean(selectedDownloadsMap[download.contentnode_id])"
                   class="download-checkbox"
-                  @change="handleCheckResource(download, $event)"
+                  @change="handleCheckResource(download.contentnode_id, $event)"
                 >
                   <KLabeledIcon
                     v-if="download.metadata"
@@ -44,17 +52,41 @@
                     :style="nonCompleteStatus(download) ? { color: $themeTokens.annotation } : {}"
                   />
                 </KCheckbox>
+                <div v-if="!windowIsLarge" class="small-screen-status">
+                  <p>
+                    {{ formattedResourceSize(download) }} &nbsp;&nbsp;
+                    {{ formatDownloadRequestedDate(download) }}
+                  </p>
+                  <KIcon
+                    v-if="download.status !== 'IN_PROGRESS'"
+                    :icon="downloadStatusIcon(download)"
+                    :color="download.status === 'PENDING' ? $themeTokens.annotation : null"
+                    class="icon"
+                  />
+                  <KCircularLoader
+                    v-if="download.status === 'IN_PROGRESS'"
+                    class="icon"
+                  />
+                  <span class="status-text">{{ formattedDownloadStatus(download) }} </span>
+                </div>
               </td>
-              <td>
+              <td v-if="windowIsLarge">
                 {{ formattedResourceSize(download) }}
               </td>
-              <td>
+              <td v-if="windowIsLarge">
+                {{ formatDownloadRequestedDate(download) }}
+              </td>
+              <td v-if="windowIsLarge">
                 <KIcon
-                  v-if="downloadStatusIcon(download)"
+                  v-if="download.status !== 'IN_PROGRESS'"
                   :icon="downloadStatusIcon(download)"
                   :color="download.status === 'PENDING' ? $themeTokens.annotation : null"
                   class="icon"
                 />
+                <KCircularLoader
+                  v-if="download.status === 'IN_PROGRESS'"
+                  class="icon"
+                />
                 <span class="status-text">{{ formattedDownloadStatus(download) }} </span>
               </td>
               <td class="resource-action">
@@ -70,33 +102,30 @@
                   appearance="flat-button"
                   :href="genExternalContentURLBackLinkCurrentPage(download.contentnode_id)"
                 />
-              </td>
-              <td class="resource-action">
                 <KButton
                   :text="coreString('removeAction')"
                   appearance="flat-button"
-                  :disabled="nonCompleteStatus(download)"
-                  @click="removeResource(download)"
+                  @click="markSingleResourceForRemoval(download)"
                 />
               </td>
             </tr>
           </tbody>
         </template>
       </CoreTable>
-      <p v-if="!loading && (!downloadRequestMap || !Object.keys(downloadRequestMap).length)">
+      <p v-if="!loading && !downloadItemListLength">
         {{ coreString('noResourcesDownloaded') }}
       </p>
     </PaginatedListContainerWithBackend>
     <SelectionBottomBar
-      :count="selectedDownloads.length"
-      :size="formattedSelectedSize()"
-      @click-remove="resourcesToDelete = selectedDownloads"
+      :count="Object.keys(selectedDownloadsMap).length"
+      :size="formattedSelectedSize"
+      @click-remove="removeSelectedResources"
     />
     <ConfirmationDeleteModal
       v-if="resourcesToDelete.length"
       :resourcesToDelete="resourcesToDelete"
       @cancel="resourcesToDelete = []"
-      @success="removeResources"
+      @success="emitCurrentlySelectedResourcesForRemoval"
     />
   </form>
 
@@ -111,14 +140,24 @@
   import CoreTable from 'kolibri.coreVue.components.CoreTable';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
   import PaginatedListContainerWithBackend from 'kolibri-common/components/PaginatedListContainerWithBackend';
-  import { computed, getCurrentInstance, watch, ref } from 'kolibri.lib.vueCompositionApi';
-  import { get, set } from '@vueuse/core';
+  import { computed, getCurrentInstance } from 'kolibri.lib.vueCompositionApi';
+  import { get } from '@vueuse/core';
+  import { createTranslator } from 'kolibri.utils.i18n';
+  import useKResponsiveWindow from 'kolibri.coreVue.composables.useKResponsiveWindow';
   import useContentLink from '../../../composables/useContentLink';
+  import useDevices from '../../../composables/useDevices';
   import useLearningActivities from '../../../composables/useLearningActivities';
   import useDownloadRequests from '../../../composables/useDownloadRequests';
   import SelectionBottomBar from './SelectionBottomBar.vue';
   import ConfirmationDeleteModal from './ConfirmationDeleteModal.vue';
 
+  const ChannelContentsSummaryStrings = createTranslator('ChannelContentsSummary', {
+    onDeviceRow: {
+      message: 'On your device',
+      context: "Indicates resources that are on the user's device.",
+    },
+  });
+
   export default {
     name: 'DownloadsList',
     components: {
@@ -132,65 +171,19 @@
       const { genExternalContentURLBackLinkCurrentPage } = useContentLink();
       const { getLearningActivityIcon } = useLearningActivities();
       const { downloadRequestMap, availableSpace } = useDownloadRequests();
-      const totalPageNumber = ref(0);
+      const { networkDevices } = useDevices();
+      const { windowIsLarge } = useKResponsiveWindow();
       const store = getCurrentInstance().proxy.$store;
       const query = computed(() => get(route).query);
       const route = computed(() => store.state.route);
-      const sort = computed(() => query.value.sort);
       const pageSizeNumber = computed(() => Number(query.value.page_size || 25));
-      const activityType = computed(() => query.value.activity || 'all');
-      const downloads = ref([]);
-      const sortedFilteredDownloads = () => {
-        let downloadsToDisplay = [];
-        if (downloadRequestMap) {
-          for (const [, value] of Object.entries(downloadRequestMap)) {
-            downloadsToDisplay.push(value);
-          }
-          if (activityType) {
-            if (activityType.value !== 'all') {
-              downloadsToDisplay = downloadsToDisplay.filter(download =>
-                download.metadata.learning_activities.includes(activityType.value)
-              );
-            }
-          }
-          if (sort) {
-            switch (sort.value) {
-              case 'newest':
-                downloadsToDisplay.sort(
-                  (a, b) => new Date(b.requested_at) - new Date(a.requested_at)
-                );
-                break;
-              case 'oldest':
-                downloadsToDisplay.sort(
-                  (a, b) => new Date(a.requested_at) - new Date(b.requested_at)
-                );
-                break;
-              case 'smallest':
-                downloadsToDisplay.sort((a, b) => a.metadata.file_size - b.metadata.file_size);
-                break;
-              case 'largest':
-                downloadsToDisplay.sort((a, b) => b.metadata.file_size - a.metadata.file_size);
-                break;
-              default:
-                // If no valid sort option provided, return unsorted array
-                break;
-            }
-          }
-        }
-        set(totalPageNumber, Math.ceil(downloadsToDisplay.length / pageSizeNumber.value));
-        set(downloads, downloadsToDisplay);
-      };
-      sortedFilteredDownloads();
-      watch(route, () => {
-        sortedFilteredDownloads();
-      });
       return {
         downloadRequestMap,
-        downloads,
+        pageSizeNumber,
         getLearningActivityIcon,
-        sortedFilteredDownloads,
-        totalPageNumber,
+        networkDevices,
         availableSpace,
+        windowIsLarge,
         genExternalContentURLBackLinkCurrentPage,
       };
     },
@@ -203,8 +196,7 @@
     data() {
       return {
         now: now(),
-        selectedDownloadsSize: 0,
-        selectedDownloads: [],
+        selectedDownloadsMap: {},
         resourcesToDelete: [],
       };
     },
@@ -238,84 +230,135 @@
           });
         },
       },
+      downloads() {
+        const sort = this.$route.query.sort;
+        const activityType = this.$route.query.activity;
+        const downloadsToDisplay = Object.values(this.downloadRequestMap).filter(download => {
+          if (activityType && activityType !== 'all') {
+            return download.metadata.learning_activities.includes(activityType);
+          }
+          return true;
+        });
+        downloadsToDisplay.sort((a, b) => {
+          if (sort === 'oldest') {
+            return new Date(a.requested_at) - new Date(b.requested_at);
+          }
+          if (sort === 'smallest') {
+            return a.metadata.file_size - b.metadata.file_size;
+          }
+          if (sort === 'largest') {
+            return b.metadata.file_size - a.metadata.file_size;
+          }
+          // By default always sort by newest.
+          return new Date(b.requested_at) - new Date(a.requested_at);
+        });
+        return downloadsToDisplay;
+      },
       paginatedDownloads() {
-        const startIndex = (this.currentPage - 1) * this.itemsPerPage;
-        const endIndex = startIndex + this.itemsPerPage;
-        return this.downloads.slice(startIndex, endIndex);
+        if (this.downloads && this.downloads.length > 0) {
+          const startIndex = (this.currentPage - 1) * this.itemsPerPage;
+          const endIndex = startIndex + this.itemsPerPage;
+          return this.downloads.slice(startIndex, endIndex);
+        }
+        return [];
+      },
+      downloadItemListLength() {
+        return this.downloads ? this.downloads.length : 0;
+      },
+      totalPageNumber() {
+        if (this.downloads && this.downloads.length && this.pageSizeNumber) {
+          return Math.ceil(this.downloads.length / this.pageSizeNumber);
+        }
+        return 1;
       },
       areAllSelected() {
-        return Object.keys(this.downloads).every(id => this.selectedDownloads.includes(id));
+        return (
+          this.areAnySelected &&
+          this.paginatedDownloads.every(download =>
+            Boolean(this.selectedDownloadsMap[download.contentnode_id])
+          )
+        );
+      },
+      areAnySelected() {
+        return this.paginatedDownloads.some(download =>
+          Boolean(this.selectedDownloadsMap[download.contentnode_id])
+        );
       },
       areAnyAvailable() {
-        if (this.downloads && this.downloads.length > 0) {
-          return this.downloads.filter(download => download.status === 'COMPLETED').length > 0;
-        }
-        return false;
+        return this.paginatedDownloads.length > 0;
       },
-    },
-    watch: {
-      selectedDownloads(newVal) {
-        this.selectedDownloadsSize = newVal.reduce(
-          (acc, object) => acc + object.metadata.file_size,
-          0
+      formattedSelectedSize() {
+        return bytesForHumans(
+          Object.keys(this.selectedDownloadsMap).reduce((acc, contentnode_id) => {
+            return acc + (this.downloadRequestMap[contentnode_id]?.metadata?.file_size || 0);
+          }, 0)
         );
       },
     },
-    mounted() {
-      this.areAnyAvailable;
-    },
     methods: {
       nonCompleteStatus(download) {
         return download.status !== 'COMPLETED';
       },
       selectAll() {
-        if (this.areAllSelected) {
-          this.selectedDownloads = this.selectedDownloads.filter(
-            download => !this.paginatedDownloads.includes(download)
-          );
-        } else {
-          this.selectedDownloads = this.selectedDownloads.concat(
-            this.paginatedDownloads.filter(download => !this.selectedDownloads.includes(download))
-          );
+        const notAllSelected = !this.areAllSelected;
+        for (const download of this.paginatedDownloads) {
+          this.handleCheckResource(download.contentnode_id, notAllSelected);
         }
       },
-      handleCheckResource(id, checked) {
+      handleCheckResource(contentnode_id, checked) {
         if (checked) {
-          this.selectedDownloads = this.selectedDownloads.concat(id);
-          return;
+          this.$set(this.selectedDownloadsMap, contentnode_id, checked);
+        } else {
+          this.$delete(this.selectedDownloadsMap, contentnode_id);
         }
-        this.selectedDownloads = this.selectedDownloads.filter(resourceId => resourceId !== id);
       },
-      resourceIsSelected(id) {
-        return this.selectedDownloads.indexOf(id) !== -1;
+      markSingleResourceForRemoval(download) {
+        this.resourcesToDelete.push(download.contentnode_id);
       },
-      removeResource(download) {
-        this.$emit('removeResources', [download]);
-        this.sortedFilteredDownloads();
+      removeSelectedResources() {
+        this.resourcesToDelete = Object.keys(this.selectedDownloadsMap);
       },
-      removeResources() {
+      emitCurrentlySelectedResourcesForRemoval() {
         this.$emit('removeResources', this.resourcesToDelete);
         this.resourcesToDelete = [];
-        this.sortedFilteredDownloads();
+        this.$nextTick(() => {
+          this.selectedDownloadsMap = {};
+          if (this.paginatedDownloads.length == 0 && this.$route.query.page) {
+            const prevPage = this.currentPage - 1;
+            this.currentPage = prevPage;
+          }
+        });
       },
       getIcon(activities) {
         return this.getLearningActivityIcon(activities);
       },
+      sourceDeviceIsAvailable(download) {
+        return Boolean(this.networkDevices[download.source_id]);
+      },
       downloadStatusIcon(download) {
         let icon;
         switch (download.status) {
+          case 'COMPLETED':
+            icon = 'correct';
+            break;
           case 'PENDING':
             icon = 'timer';
             break;
           case 'FAILED':
             icon = 'error';
             break;
+          case 'IN_PROGRESS':
+            icon = 'error';
+            break;
           default:
             // If no valid sort option provided, return unsorted array
             break;
         }
         return icon;
       },
+      formatDownloadRequestedDate(download) {
+        return this.$formatRelative(download.requested_at, { now: this.now });
+      },
       formattedDownloadStatus(download) {
         let message = '';
         switch (download.status) {
@@ -325,14 +368,17 @@
           case 'IN_PROGRESS':
             message = this.coreString('inProgressLabel');
             break;
-          case 'COMPLETED' && this.now - download.requested_at < 10000:
-            message = this.coreString('justNow');
-            break;
           case 'COMPLETED':
-            message = this.$formatRelative(download.requested_at, { now: this.now });
+            /* eslint-disable kolibri/vue-no-undefined-string-uses */
+            message = ChannelContentsSummaryStrings.$tr('onDeviceRow');
+            /* eslint-enable */
             break;
           case 'FAILED':
-            message = this.coreString('downloadFailedWillRetry');
+            if (this.sourceDeviceIsAvailable(download)) {
+              message = this.coreString('downloadFailedWillRetry');
+            } else {
+              message = this.coreString('downloadedFailedCanNotRetry');
+            }
             break;
           default:
             // If no valid sort option provided, return unsorted array
@@ -345,9 +391,6 @@
           return bytesForHumans(download.metadata.file_size);
         }
       },
-      formattedSelectedSize() {
-        return bytesForHumans(this.selectedDownloadsSize);
-      },
     },
   };
 
@@ -373,19 +416,17 @@
   }
 
   .resource-action {
-    max-width: 70px !important;
     text-align: right;
   }
 
-  .icon {
-    width: 24px !important;
-    height: 24px !important;
-  }
-
   .status-text {
     position: relative;
-    top: -4px;
     padding: 8px;
   }
 
+  .small-screen-status {
+    margin: 0 48px;
+    font-size: 12px;
+  }
+
 </style>
diff --git a/kolibri/plugins/learn/assets/src/my_downloads/views/Filters/ActivityFilter.vue b/kolibri/plugins/learn/assets/src/my_downloads/views/Filters/ActivityFilter.vue
index f89124708af..f680f46e6a9 100644
--- a/kolibri/plugins/learn/assets/src/my_downloads/views/Filters/ActivityFilter.vue
+++ b/kolibri/plugins/learn/assets/src/my_downloads/views/Filters/ActivityFilter.vue
@@ -98,6 +98,7 @@
             query: pickBy({
               ...this.$route.query,
               activity: value,
+              page: 1,
             }),
           });
         },
diff --git a/kolibri/plugins/learn/assets/src/my_downloads/views/Filters/SortFilter.vue b/kolibri/plugins/learn/assets/src/my_downloads/views/Filters/SortFilter.vue
index 476d4e19ce5..19a0bc49004 100644
--- a/kolibri/plugins/learn/assets/src/my_downloads/views/Filters/SortFilter.vue
+++ b/kolibri/plugins/learn/assets/src/my_downloads/views/Filters/SortFilter.vue
@@ -70,6 +70,7 @@
             query: pickBy({
               ...this.$route.query,
               sort: value,
+              page: 1,
             }),
           });
         },
diff --git a/kolibri/plugins/learn/assets/src/my_downloads/views/MyDownloads.vue b/kolibri/plugins/learn/assets/src/my_downloads/views/MyDownloads.vue
index 7309f228022..6a7071cadb7 100644
--- a/kolibri/plugins/learn/assets/src/my_downloads/views/MyDownloads.vue
+++ b/kolibri/plugins/learn/assets/src/my_downloads/views/MyDownloads.vue
@@ -55,10 +55,11 @@
   import { get } from '@vueuse/core';
   import bytesForHumans from 'kolibri.utils.bytesForHumans';
   import AppBarPage from 'kolibri.coreVue.components.AppBarPage';
-  import { computed, getCurrentInstance, watch, ref } from 'kolibri.lib.vueCompositionApi';
+  import { computed, getCurrentInstance } from 'kolibri.lib.vueCompositionApi';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
   import responsiveWindowMixin from 'kolibri.coreVue.mixins.responsiveWindowMixin';
   import useDownloadRequests from '../../composables/useDownloadRequests';
+  import useDevices from '../../composables/useDevices';
   import DownloadsList from './DownloadsList';
   import ActivityFilter from './Filters/ActivityFilter.vue';
   import SortFilter from './Filters/SortFilter.vue';
@@ -76,40 +77,28 @@
       const {
         downloadRequestMap,
         loading,
-        fetchUserDownloadRequests,
+        pollUserDownloadRequests,
         fetchAvailableFreespace,
         availableSpace,
         removeDownloadRequest,
       } = useDownloadRequests();
+      const { fetchDevices } = useDevices();
 
       const store = getCurrentInstance().proxy.$store;
       const route = computed(() => store.state.route);
       const query = computed(() => get(route).query);
 
-      const pageNumber = computed(() => Number(query.value.page || 1));
-      const pageSizeNumber = computed(() => Number(query.value.page_size || 25));
-      const activityType = computed(() => query.value.activity || 'all');
       const sort = computed(() => query.value.sort);
-      const totalPageNumber = ref(0);
-
-      const fetchDownloads = () => {
-        fetchUserDownloadRequests({
-          sort: sort.value,
-          page: pageNumber.value,
-          pageSize: pageSizeNumber.value,
-          activityType: activityType.value,
-        });
-      };
-      fetchDownloads();
+
       fetchAvailableFreespace();
-      watch(route, fetchDownloads);
+      pollUserDownloadRequests();
 
       return {
         downloadRequestMap,
         loading,
         availableSpace,
-        totalPageNumber,
         fetchAvailableFreespace,
+        fetchDevices,
         sort,
         removeDownloadRequest,
       };
@@ -130,13 +119,9 @@
           return bytesForHumans(0);
         }
       },
-      removeResources(resources) {
-        if (resources.length === 1) {
-          this.removeDownloadRequest(resources[0]);
-        } else {
-          resources.forEach(resource => {
-            this.removeDownloadRequest({ id: resource.id });
-          });
+      removeResources(contentNodeIds) {
+        for (const contentNodeId of contentNodeIds) {
+          this.removeDownloadRequest(contentNodeId);
         }
       },
     },
diff --git a/kolibri/plugins/learn/assets/src/my_downloads/views/MyDownloadsSideNavEntry.js b/kolibri/plugins/learn/assets/src/my_downloads/views/MyDownloadsSideNavEntry.js
index 0f2b3bd97ab..8c4e2cc9420 100644
--- a/kolibri/plugins/learn/assets/src/my_downloads/views/MyDownloadsSideNavEntry.js
+++ b/kolibri/plugins/learn/assets/src/my_downloads/views/MyDownloadsSideNavEntry.js
@@ -2,6 +2,7 @@ import { UserKinds, NavComponentSections } from 'kolibri.coreVue.vuex.constants'
 import navComponents from 'kolibri.utils.navComponents';
 import coreStrings from 'kolibri.utils.coreStrings';
 import urls from 'kolibri.urls';
+import plugin_data from 'plugin_data';
 
 const component = {
   name: 'MyDownloadsSideNavEntry',
@@ -17,6 +18,8 @@ const component = {
   section: NavComponentSections.ACCOUNT,
 };
 
-navComponents.register(component);
+if (plugin_data.allowLearnerDownloads) {
+  navComponents.register(component);
+}
 
 export default component;
diff --git a/kolibri/plugins/learn/assets/src/routes/index.js b/kolibri/plugins/learn/assets/src/routes/index.js
index 58d8ea80d5e..aa832ed02c5 100644
--- a/kolibri/plugins/learn/assets/src/routes/index.js
+++ b/kolibri/plugins/learn/assets/src/routes/index.js
@@ -68,7 +68,6 @@ export default [
         next({ name: PageNames.LIBRARY, replace: true });
         return;
       }
-      store.commit('CORE_SET_PAGE_LOADING', true);
     },
     component: LibraryPage,
     props: route => {
@@ -162,13 +161,16 @@ export default [
     path: '/explore_libraries',
     component: ExploreLibrariesPage,
     handler: (to, from, next) => {
-      if (!unassignedContentGuard(next)) {
+      if (unassignedContentGuard(next)) {
         return;
       }
       if (!get(isUserLoggedIn)) {
         next({ name: PageNames.LIBRARY, replace: true });
         return;
       }
+      store.commit('SET_PAGE_NAME', PageNames.EXPLORE_LIBRARIES);
+      store.commit('CORE_SET_PAGE_LOADING', false);
+      next();
     },
   },
   {
diff --git a/kolibri/plugins/learn/assets/src/views/AlsoInThis.vue b/kolibri/plugins/learn/assets/src/views/AlsoInThis.vue
index c516327052e..128ff1a7492 100644
--- a/kolibri/plugins/learn/assets/src/views/AlsoInThis.vue
+++ b/kolibri/plugins/learn/assets/src/views/AlsoInThis.vue
@@ -5,20 +5,22 @@
     <div
       v-if="contentNodes.length"
       class="content-list"
-      :class="nextContent ? 'bottom-link' : ''"
+      :class="nextFolder ? 'bottom-link' : ''"
     >
       <KRouterLink
         v-for="content in contentNodes"
         :key="content.id"
-        :to="genContentLinkKeepCurrentBackLink(content.id, content.is_leaf)"
+        :to="content.is_leaf ?
+          genContentLinkKeepCurrentBackLink(content.id, content.is_leaf) :
+          genContentLinkKeepPreviousBackLink(content.id)"
         class="item"
         :class="[windowIsSmall && 'small',
-                 currentResource(content.content_id) &&
+                 content.id === currentResourceId &&
                    $computedClass(currentlyViewedItemStyle)]"
         :style="linkStyles"
       >
         <p
-          v-if="currentResource(content.content_id)"
+          v-if="content.id === currentResourceId"
           :style="currentlyViewingTextStyle"
         >
           {{ $tr('currentlyViewing') }}
@@ -67,8 +69,8 @@
     </div>
 
     <KRouterLink
-      v-if="nextContent"
-      :to="genContentLinkKeepCurrentBackLink(nextContent.id, nextContent.is_leaf)"
+      v-if="nextFolder"
+      :to="genContentLinkKeepPreviousBackLink(nextFolder.id)"
       class="next-content-link"
       :style="{
         borderTop: '1px solid ' + $themeTokens.fineLine,
@@ -81,7 +83,7 @@
         {{ nextFolderMessage }}
       </div>
       <div class="next-title">
-        {{ nextContent.title }}
+        {{ nextFolder.title }}
       </div>
       <KIcon class="forward-icon" icon="forward" />
     </KRouterLink>
@@ -114,8 +116,15 @@
     mixins: [KResponsiveWindowMixin],
     setup() {
       const { contentNodeProgressMap } = useContentNodeProgress();
-      const { genContentLinkKeepCurrentBackLink } = useContentLink();
-      return { contentNodeProgressMap, genContentLinkKeepCurrentBackLink };
+      const {
+        genContentLinkKeepCurrentBackLink,
+        genContentLinkKeepPreviousBackLink,
+      } = useContentLink();
+      return {
+        contentNodeProgressMap,
+        genContentLinkKeepCurrentBackLink,
+        genContentLinkKeepPreviousBackLink,
+      };
     },
     props: {
       /**
@@ -128,7 +137,7 @@
         default: () => [],
       },
       /** Content node with the following properties: id, is_leaf, title */
-      nextContent: {
+      nextFolder: {
         type: Object, // or falsy
         required: false,
         default: () => {},
@@ -148,7 +157,7 @@
         type: Boolean,
         default: false,
       },
-      currentResourceID: {
+      currentResourceId: {
         type: String,
         required: true,
       },
@@ -188,25 +197,18 @@
         };
       },
       emptyMessage() {
-        /* eslint-disable kolibri/vue-no-undefined-string-uses */
         return this.isLesson
           ? this.$tr('noOtherLessonResources')
           : this.$tr('noOtherTopicResources');
-        /* eslint-enable */
       },
       nextFolderMessage() {
-        /* eslint-disable kolibri/vue-no-undefined-string-uses */
         return this.$tr('nextFolder');
-        /* eslint-enable */
       },
     },
     methods: {
       progressFor(node) {
         return this.contentNodeProgressMap[node.content_id] || 0;
       },
-      currentResource(contentId) {
-        return contentId === this.currentResourceID || '';
-      },
     },
     $trs: {
       currentlyViewing: {
diff --git a/kolibri/plugins/learn/assets/src/views/CardList.vue b/kolibri/plugins/learn/assets/src/views/CardList.vue
index d0f2a5b98b4..ba1dc55e03c 100644
--- a/kolibri/plugins/learn/assets/src/views/CardList.vue
+++ b/kolibri/plugins/learn/assets/src/views/CardList.vue
@@ -37,7 +37,7 @@
               </h3>
               <p
                 v-if="contentNode.description"
-                style="font-size: 14px; marginTop: 4px; marginBottom: 4px;"
+                style="font-size: 14px; margin-top: 4px; margin-bottom: 4px;"
               >
                 <TextTruncatorCss :text="contentNode.description" :maxLines="2" />
               </p>
diff --git a/kolibri/plugins/learn/assets/src/views/ChannelCardGroupGrid.vue b/kolibri/plugins/learn/assets/src/views/ChannelCardGroupGrid.vue
index 690d1d1da29..49db0c7b38f 100644
--- a/kolibri/plugins/learn/assets/src/views/ChannelCardGroupGrid.vue
+++ b/kolibri/plugins/learn/assets/src/views/ChannelCardGroupGrid.vue
@@ -10,7 +10,7 @@
         :isMobile="windowIsSmall"
         :title="content.title || content.name"
         :thumbnail="content.thumbnail"
-        :tagline="getTagLine(content)"
+        :tagline="content.tagline || content.description"
         :numCoachContents="content.num_coach_contents"
         :link="genContentLinkBackLinkCurrentPage(content.id, false, deviceId)"
         :isRemote="isRemote"
@@ -26,6 +26,7 @@
 <script>
 
   import useKResponsiveWindow from 'kolibri.coreVue.composables.useKResponsiveWindow';
+  import useCardLayoutSpan from '../composables/useCardLayoutSpan';
   import useContentLink from '../composables/useContentLink';
   import ChannelCard from './ChannelCard';
 
@@ -37,12 +38,13 @@
     setup() {
       const { genContentLinkBackLinkCurrentPage } = useContentLink();
       const { windowIsSmall } = useKResponsiveWindow();
+      const { layoutSpan } = useCardLayoutSpan();
       return {
         genContentLinkBackLinkCurrentPage,
         windowIsSmall,
+        layoutSpan,
       };
     },
-    inject: ['$layoutSpan'],
     props: {
       contents: {
         type: Array,
@@ -58,16 +60,6 @@
         default: false,
       },
     },
-    computed: {
-      layoutSpan() {
-        return this.$layoutSpan();
-      },
-    },
-    methods: {
-      getTagLine(content) {
-        return content.tagline || content.description;
-      },
-    },
   };
 
 </script>
diff --git a/kolibri/plugins/learn/assets/src/views/CompletionModal/index.vue b/kolibri/plugins/learn/assets/src/views/CompletionModal/index.vue
index 086e8555683..8463e634caa 100644
--- a/kolibri/plugins/learn/assets/src/views/CompletionModal/index.vue
+++ b/kolibri/plugins/learn/assets/src/views/CompletionModal/index.vue
@@ -151,7 +151,7 @@
   import PointsIcon from 'kolibri.coreVue.components.PointsIcon';
   import { ContentNodeResource } from 'kolibri.resources';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
-  import useDevices from '../../composables/useDevices';
+  import { currentDeviceData } from '../../composables/useDevices';
   import useDeviceSettings from '../../composables/useDeviceSettings';
   import useLearnerResources from '../../composables/useLearnerResources';
   import useContentLink from '../../composables/useContentLink';
@@ -183,7 +183,7 @@
       const { canAccessUnassignedContent } = useDeviceSettings();
       const { fetchLesson } = useLearnerResources();
       const { genContentLinkKeepCurrentBackLink } = useContentLink();
-      const { baseurl } = useDevices();
+      const { baseurl } = currentDeviceData();
       return {
         baseurl,
         canAccessUnassignedContent,
diff --git a/kolibri/plugins/learn/assets/src/views/ContentPage.vue b/kolibri/plugins/learn/assets/src/views/ContentPage.vue
index 6835beca458..09d2271caae 100644
--- a/kolibri/plugins/learn/assets/src/views/ContentPage.vue
+++ b/kolibri/plugins/learn/assets/src/views/ContentPage.vue
@@ -352,9 +352,11 @@
 
 <style lang="scss" scoped>
 
-  .content {
-    z-index: 0;
-    max-height: 100vh;
+  .content-renderer {
+    // 61 pixels is the height of the Learning Activity Bar + 5px.
+    // This seems to be the largest height that the content renderer can be
+    // without causing the page to scroll.
+    height: calc(100vh - 61px);
   }
 
 </style>
diff --git a/kolibri/plugins/learn/assets/src/views/ExamPage/index.vue b/kolibri/plugins/learn/assets/src/views/ExamPage/index.vue
index e0bdff1f9da..6256beac76e 100644
--- a/kolibri/plugins/learn/assets/src/views/ExamPage/index.vue
+++ b/kolibri/plugins/learn/assets/src/views/ExamPage/index.vue
@@ -4,7 +4,8 @@
     :route="homePageLink"
     :appBarTitle="exam.title || ''"
   >
-    <KGrid :gridStyle="gridStyle">
+    <KCircularLoader v-if="loading" />
+    <KGrid v-else :gridStyle="gridStyle">
       <!-- this.$refs.questionListWrapper is referenced inside AnswerHistory for scrolling -->
       <KGridItem
         v-if="windowIsLarge"
@@ -63,7 +64,7 @@
               :answerState="currentAttempt.answer"
               @interaction="saveAnswer"
             />
-            <MissingResourceAlert v-else :multiple="false" />
+            <ResourceSyncingUiAlert v-else :multiple="false" />
           </KPageContainer>
 
           <BottomAppBar :dir="bottomBarLayoutDirection" :maxWidth="null">
@@ -185,7 +186,7 @@
   import TimeDuration from 'kolibri.coreVue.components.TimeDuration';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
   import ImmersivePage from 'kolibri.coreVue.components.ImmersivePage';
-  import MissingResourceAlert from 'kolibri-common/components/MissingResourceAlert';
+  import ResourceSyncingUiAlert from '../ResourceSyncingUiAlert';
   import useProgressTracking from '../../composables/useProgressTracking';
   import { PageNames, ClassesPageNames } from '../../constants';
   import { LearnerClassroomResource } from '../../apiResources';
@@ -207,7 +208,7 @@
       TimeDuration,
       SuggestedTime,
       ImmersivePage,
-      MissingResourceAlert,
+      ResourceSyncingUiAlert,
     },
     mixins: [responsiveWindowMixin, commonCoreStrings],
     setup() {
@@ -237,6 +238,9 @@
       };
     },
     computed: {
+      ...mapState({
+        loading: state => state.core.loading,
+      }),
       ...mapState('examViewer', ['exam', 'contentNodeMap', 'questions', 'questionNumber']),
       gridStyle() {
         if (!this.windowIsSmall) {
diff --git a/kolibri/plugins/learn/assets/src/views/ExploreLibrariesPage/LibraryItem.vue b/kolibri/plugins/learn/assets/src/views/ExploreLibrariesPage/LibraryItem.vue
index 569c37df1a8..2a3c1d14d0f 100644
--- a/kolibri/plugins/learn/assets/src/views/ExploreLibrariesPage/LibraryItem.vue
+++ b/kolibri/plugins/learn/assets/src/views/ExploreLibrariesPage/LibraryItem.vue
@@ -21,7 +21,7 @@
             <KIconButton
               ref="pinIcon"
               :icon="pinIcon"
-              :disabled="disablePinDevice"
+              :disabled="isStudio"
               appearance="flat-button"
               @click="$emit('togglePin', deviceId)"
             />
@@ -33,7 +33,7 @@
             </KTooltip>
           </h2>
           <p
-            v-if="showDescription"
+            v-if="isStudio"
             class="device-description"
           >
             {{ $tr('channels', { channels: totalChannels }) }}
@@ -48,25 +48,16 @@
         <KRouterLink
           appearance="raised-button"
           :text="coreString('explore')"
-          :to="genLibraryPageBackLink(deviceId, false)"
-        />
-      </KGridItem>
-    </div>
-    <div class="library-channels">
-      <KGridItem
-        v-for="channel in channels"
-        :key="channel.id"
-        :layout="{ span: layoutSpan }"
-      >
-        <ChannelCard
-          :title="channel.name"
-          :tagline="channel.tagline || channel.description"
-          :thumbnail="channel.thumbnail"
-          :link="genContentLinkBackLinkCurrentPage(channel.root, false, deviceId)"
-          :version="channel.version"
+          :to="genLibraryPageBackLink(deviceId)"
         />
       </KGridItem>
     </div>
+    <ChannelCardGroupGrid
+      data-test="channel-cards"
+      :deviceId="device.id"
+      :contents="(channels || []).slice(0, channelsToDisplay)"
+      :isRemote="true"
+    />
   </KGrid>
 
 </template>
@@ -77,12 +68,13 @@
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
   import useKResponsiveWindow from 'kolibri.coreVue.composables.useKResponsiveWindow';
   import useContentLink from '../../composables/useContentLink';
-  import ChannelCard from '../ChannelCard';
+  import { KolibriStudioId } from '../../constants';
+  import ChannelCardGroupGrid from '../ChannelCardGroupGrid';
 
   export default {
     name: 'LibraryItem',
     components: {
-      ChannelCard,
+      ChannelCardGroupGrid,
     },
     mixins: [commonCoreStrings],
     setup() {
@@ -97,19 +89,10 @@
       };
     },
     props: {
-      deviceId: {
-        type: String,
-        default: null,
-      },
-      deviceName: {
-        type: String,
-        required: false,
-        default: null,
-      },
-      deviceIcon: {
-        type: String,
-        required: false,
-        default: null,
+      device: {
+        type: Object,
+        required: true,
+        default: () => ({}),
       },
       channels: {
         type: Array,
@@ -118,51 +101,40 @@
           return [];
         },
       },
-      pinIcon: {
-        type: String,
-        required: true,
-        default: null,
-      },
-      totalChannels: {
+      channelsToDisplay: {
         type: Number,
-        required: false,
-        default: 0,
-      },
-      showDescription: {
-        type: Boolean,
-        required: false,
-        default: false,
+        required: true,
       },
-      disablePinDevice: {
+      pinned: {
         type: Boolean,
-        required: false,
+        required: true,
         default: false,
       },
     },
     computed: {
-      layoutSpan() {
-        /**
-         * The breakpoints below represent the window widths
-         * 0: < 480px  | Small screen  | 4 columns
-         * 1: < 600px  | Small screen  | 4 columns
-         * 2: < 840px  | Medium screen | 8 columns
-         * 3: < 960px  | Large screen  | 12 columns
-         * 4: < 1280px | Large screen  | 12 columns
-         * 5: < 1440px | Large screen  | 12 columns
-         * 6: < 1600px | Large screen  | 12 columns
-         *
-         * On resize, display X cards per row where:
-         * X = total columns in grid / column span for each card.
-         * For example, if the total number of columns is 12, and
-         * column span for each cards is 4, then X is 3.
-         */
-        let span = 3;
-        if ([0, 1, 2, 6].includes(this.windowBreakpoint)) {
-          span = 4;
-        } else if ([3, 4, 5].includes(this.windowBreakpoint)) {
-          span = 6;
+      totalChannels() {
+        return this.channels.length;
+      },
+      isStudio() {
+        return this.deviceId === KolibriStudioId;
+      },
+      deviceIcon() {
+        if (this.device['operating_system'] === 'Android') {
+          return 'device';
+        } else if (!this.device['subset_of_users_device']) {
+          return 'cloud';
+        } else {
+          return 'laptop';
         }
-        return span;
+      },
+      deviceName() {
+        return this.device ? this.device.device_name : '';
+      },
+      deviceId() {
+        return this.device ? this.device.instance_id : '';
+      },
+      pinIcon() {
+        return this.pinned ? 'pinned' : 'notPinned';
       },
     },
     $trs: {
diff --git a/kolibri/plugins/learn/assets/src/views/ExploreLibrariesPage/index.vue b/kolibri/plugins/learn/assets/src/views/ExploreLibrariesPage/index.vue
index a1370db1ae7..8ff167cabc1 100644
--- a/kolibri/plugins/learn/assets/src/views/ExploreLibrariesPage/index.vue
+++ b/kolibri/plugins/learn/assets/src/views/ExploreLibrariesPage/index.vue
@@ -18,52 +18,53 @@
         {{ $tr('showingLibraries') }}
       </p>
     </div>
-    <LibraryItem
-      v-for="device in pinnedDevices"
-      :key="device['instance_id']"
-      :deviceId="device['instance_id']"
-      :deviceName="device['device_name']"
-      :deviceIcon="getDeviceIcon(device)"
-      :channels="device.channels"
-      :totalChannels="device['total_count']"
-      :pinIcon="getPinIcon(true)"
-      :showDescription="device['instance_id'] === studioId"
-      :disablePinDevice="device['instance_id'] === studioId"
-      @togglePin="handlePinToggle"
-    />
-    <div v-if="areMoreDevicesAvailable">
-      <div
-        v-if="pinnedDevicesExist"
-        data-test="more-libraries"
-      >
-        <h2>{{ learnString('moreLibraries') }}</h2>
+    <div v-if="loading">
+      <KCircularLoader />
+    </div>
+    <FadeInTransitionGroup v-else>
+      <LibraryItem
+        v-for="device in pinnedDevices"
+        :key="device['instance_id']"
+        :device="device"
+        :channels="deviceChannelsMap[device['instance_id']]"
+        :channelsToDisplay="cardsToDisplay"
+        :pinned="true"
+        @togglePin="handlePinToggle"
+      />
+      <div v-if="areMoreDevicesAvailable" key="moreDevices">
+        <div
+          v-if="pinnedDevicesExist"
+          data-test="more-libraries"
+        >
+          <h2>{{ learnString('moreLibraries') }}</h2>
+          <KButton
+            v-if="displayShowButton"
+            data-test="show-button"
+            :text="coreString('showAction')"
+            :primary="false"
+            @click="loadMoreDevices"
+          />
+        </div>
+        <FadeInTransitionGroup>
+          <LibraryItem
+            v-for="device in unpinnedDevices.slice(0, moreDevices)"
+            :key="device['instance_id']"
+            :device="device"
+            :channels="deviceChannelsMap[device['instance_id']]"
+            :channelsToDisplay="cardsToDisplay"
+            :pinned="false"
+            @togglePin="handlePinToggle"
+          />
+        </FadeInTransitionGroup>
         <KButton
-          v-if="displayShowButton"
-          data-test="show-button"
-          :text="coreString('showAction')"
+          v-if="displayShowMoreButton"
+          data-test="show-more-button"
+          :text="coreString('showMoreAction')"
           :primary="false"
           @click="loadMoreDevices"
         />
       </div>
-      <LibraryItem
-        v-for="(device, index) in unpinnedDevices.slice(0, moreDevices)"
-        :key="index"
-        :deviceId="device['instance_id']"
-        :deviceName="device['device_name']"
-        :deviceIcon="getDeviceIcon(device)"
-        :channels="device.channels"
-        :totalChannels="device['total_count']"
-        :pinIcon="getPinIcon(false)"
-        @togglePin="handlePinToggle"
-      />
-      <KButton
-        v-if="displayShowMoreButton"
-        data-test="show-more-button"
-        :text="coreString('showMoreAction')"
-        :primary="false"
-        @click="loadMoreDevices"
-      />
-    </div>
+    </FadeInTransitionGroup>
   </ImmersivePage>
 
 </template>
@@ -71,47 +72,76 @@
 
 <script>
 
+  import { get, set } from '@vueuse/core';
+  import { ref, watch } from 'kolibri.lib.vueCompositionApi';
   import ImmersivePage from 'kolibri.coreVue.components.ImmersivePage';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
-  import { crossComponentTranslator, localeCompare } from 'kolibri.utils.i18n';
   import commonLearnStrings from '../commonLearnStrings';
-  import useChannels from '../../composables/useChannels';
+  import FadeInTransitionGroup from '../FadeInTransitionGroup';
+  import useCardLayoutSpan from '../../composables/useCardLayoutSpan';
   import useContentLink from '../../composables/useContentLink';
   import useDevices from '../../composables/useDevices';
   import usePinnedDevices from '../../composables/usePinnedDevices';
-  import { KolibriStudioId } from '../../constants';
   import LibraryItem from './LibraryItem';
 
-  const PinStrings = crossComponentTranslator(LibraryItem);
+  const moreDevicesIncrement = 4;
 
   export default {
     name: 'ExploreLibrariesPage',
     components: {
+      FadeInTransitionGroup,
       ImmersivePage,
       LibraryItem,
     },
     mixins: [commonCoreStrings, commonLearnStrings],
     setup() {
-      const { fetchChannels } = useChannels();
+      const {
+        networkDevicesWithChannels,
+        keepDeviceChannelsUpdated,
+        deviceChannelsMap,
+        isLoadingChannels,
+      } = useDevices();
+      const {
+        handlePinToggle,
+        fetchPinsForUser,
+        userPinsMap,
+        pinnedDevices,
+        unpinnedDevices,
+        pinnedDevicesExist,
+      } = usePinnedDevices(networkDevicesWithChannels);
       const { back } = useContentLink();
-      const { fetchDevices } = useDevices();
-      const { createPinForUser, deletePinForUser, fetchPinsForUser } = usePinnedDevices();
+      const { makeComputedCardCount } = useCardLayoutSpan();
+      const moreDevices = ref(0);
+
+      keepDeviceChannelsUpdated();
+
+      fetchPinsForUser().then(() => {
+        set(moreDevices, get(pinnedDevicesExist) ? 0 : moreDevicesIncrement);
+      });
+
+      watch(pinnedDevicesExist, (newVal, oldVal) => {
+        if (!oldVal && newVal) {
+          // Always show at least 4 devices
+          set(moreDevices, Math.max(moreDevicesIncrement - get(pinnedDevices).length, 0));
+        } else if (oldVal && !newVal && !get(moreDevices)) {
+          set(moreDevices, moreDevicesIncrement);
+        }
+      });
+
+      const cardsToDisplay = makeComputedCardCount(1, 3);
 
       return {
-        deletePinForUser,
-        createPinForUser,
-        fetchPinsForUser,
-        fetchChannels,
-        fetchDevices,
+        handlePinToggle,
+        pinnedDevices,
+        unpinnedDevices,
+        pinnedDevicesExist,
+        userPinsMap,
+        deviceChannelsMap,
+        networkDevicesWithChannels,
         back,
-      };
-    },
-    data() {
-      return {
-        loading: false,
-        networkDevices: {},
-        moreDevices: 0,
-        usersPins: [],
+        loading: isLoadingChannels,
+        moreDevices,
+        cardsToDisplay,
       };
     },
     computed: {
@@ -122,20 +152,7 @@
         return this.moreDevices === 0 && this.areMoreDevicesAvailable;
       },
       displayShowMoreButton() {
-        return this.moreDevices < this.unpinnedDevices?.length;
-      },
-      networkDevicesWithChannels() {
-        return Object.values(this.networkDevices)
-          .filter(device => device.channels?.length > 0)
-          .sort((a, b) => {
-            if (a.instance_id === this.studioId) {
-              return 1;
-            }
-            if (b.instance_id === this.studioId) {
-              return -1;
-            }
-            return localeCompare(a.device_name, b.device_name);
-          });
+        return !this.displayShowButton && this.moreDevices < this.unpinnedDevices?.length;
       },
       pageHeaderStyle() {
         return {
@@ -143,134 +160,10 @@
           color: this.$themeTokens.text,
         };
       },
-      studioId() {
-        return KolibriStudioId;
-      },
-      usersPinsDeviceIds() {
-        // The IDs of devices (mapped to instance_id on the networkDevicesWithChannels
-        // items) -- which the user has pinned
-        return this.usersPins.map(pin => pin.instance_id);
-      },
-      pinnedDevices() {
-        return this.networkDevicesWithChannels.filter(device => {
-          return (
-            this.usersPinsDeviceIds.includes(device.instance_id) ||
-            device.instance_id === this.studioId
-          );
-        });
-      },
-      pinnedDevicesExist() {
-        return this.pinnedDevices.length > 0;
-      },
-      unpinnedDevices() {
-        return this.networkDevicesWithChannels.filter(device => {
-          return (
-            !this.usersPinsDeviceIds.includes(device.instance_id) &&
-            device.instance_id !== this.studioId
-          );
-        });
-      },
-    },
-    watch: {
-      pinnedDevicesExist: {
-        handler(newValue) {
-          if (!newValue) {
-            this.loadMoreDevices();
-          }
-        },
-        deep: true,
-        immediate: false,
-      },
-    },
-    created() {
-      this.loading = true;
-      // Fetch user's pins
-      this.fetchPinsForUser().then(resp => {
-        this.usersPins = resp.map(pin => {
-          const instance_id = pin.instance_id.replace(/-/g, '');
-          return { ...pin, instance_id };
-        });
-        if (this.usersPins.length === 0) {
-          this.loadMoreDevices();
-        }
-      });
-
-      this.fetchDevices().then(devices => {
-        const promises = [];
-        for (const device of devices) {
-          const baseurl = device.base_url;
-          const promise = this.fetchChannels({ baseurl })
-            .then(channels => {
-              this.addNetworkDevice(device, channels);
-              // Set loading to false once we have successfully fetched channels
-              // for any device.
-              this.loading = false;
-            })
-            .catch(() => {
-              this.addNetworkDevice(device, []);
-            });
-          promises.push(promise);
-        }
-        Promise.all(promises).then(() => {
-          // In case we don't successfully fetch any channels, don't do a perpetual loading
-          // state.
-          this.loading = false;
-        });
-      });
     },
     methods: {
-      addNetworkDevice(device, channels) {
-        this.$set(
-          this.networkDevices,
-          device.instance_id,
-          Object.assign(device, {
-            channels: channels.slice(0, 4),
-            total_count: channels.length,
-          })
-        );
-      },
-      createPin(instance_id) {
-        return this.createPinForUser(instance_id).then(response => {
-          const id = response.id;
-          this.usersPins = [...this.usersPins, { instance_id, id }];
-          this.moreDevices = 0;
-          // eslint-disable-next-line
-          this.$store.dispatch('createSnackbar', PinStrings.$tr('pinnedTo'));
-        });
-      },
-      deletePin(instance_id, pinId) {
-        return this.deletePinForUser(pinId).then(() => {
-          // Remove this pin from the usersPins
-          this.usersPins = this.usersPins.filter(pin => pin.instance_id != instance_id);
-          if (this.usersPins.length === 0) {
-            this.loadMoreDevices();
-          }
-          // eslint-disable-next-line
-          this.$store.dispatch('createSnackbar', PinStrings.$tr('pinRemoved'));
-        });
-      },
-      handlePinToggle(instance_id) {
-        if (this.usersPinsDeviceIds.includes(instance_id)) {
-          const pinId = this.usersPins.find(pin => pin.instance_id === instance_id);
-          this.deletePin(instance_id, pinId);
-        } else {
-          this.createPin(instance_id);
-        }
-      },
-      getDeviceIcon(device) {
-        if (device['operating_system'] === 'Android') {
-          return 'device';
-        } else if (!device['subset_of_users_device']) {
-          return 'cloud';
-        } else {
-          return 'laptop';
-        }
-      },
-      getPinIcon(pinned) {
-        return pinned ? 'pinned' : 'notPinned';
-      },
       loadMoreDevices() {
-        this.moreDevices += 4;
+        this.moreDevices += moreDevicesIncrement;
       },
     },
     $trs: {
diff --git a/kolibri/plugins/learn/assets/src/views/FadeInTransitionGroup.vue b/kolibri/plugins/learn/assets/src/views/FadeInTransitionGroup.vue
new file mode 100644
index 00000000000..d3afd92a6f7
--- /dev/null
+++ b/kolibri/plugins/learn/assets/src/views/FadeInTransitionGroup.vue
@@ -0,0 +1,30 @@
+<template>
+
+  <transition-group name="channel-list" tag="div">
+    <slot>
+    </slot>
+  </transition-group>
+
+</template>
+
+
+<script>
+
+  export default {
+    name: 'FadeInTransitionGroup',
+  };
+
+</script>
+
+
+<style scoped>
+
+  .channel-list-enter-active, .channel-list-leave-active, .channel-list-move {
+    transition: opacity 0.25s ease;
+  }
+
+  .channel-list-enter, .channel-list-leave-to {
+    opacity: 0;
+  }
+
+</style>
diff --git a/kolibri/plugins/learn/assets/src/views/HomePage/index.vue b/kolibri/plugins/learn/assets/src/views/HomePage/index.vue
index db4eb3cff59..aa640671a3c 100644
--- a/kolibri/plugins/learn/assets/src/views/HomePage/index.vue
+++ b/kolibri/plugins/learn/assets/src/views/HomePage/index.vue
@@ -2,7 +2,10 @@
 
   <LearnAppBarPage :appBarTitle="learnString('learnLabel')">
     <div v-if="!loading" id="main" role="main">
-      <MissingResourceAlert v-if="missingResources" />
+      <ResourceSyncingUiAlert
+        v-if="missingResources"
+        @syncComplete="hydrateHomePage"
+      />
       <YourClasses
         v-if="displayClasses"
         class="section"
@@ -58,8 +61,8 @@
   import { get } from '@vueuse/core';
   import client from 'kolibri.client';
   import urls from 'kolibri.urls';
-  import MissingResourceAlert from 'kolibri-common/components/MissingResourceAlert';
   import useUser from 'kolibri.coreVue.composables.useUser';
+  import ResourceSyncingUiAlert from '../ResourceSyncingUiAlert';
   import useChannels from '../../composables/useChannels';
   import useDeviceSettings from '../../composables/useDeviceSettings';
   import useLearnerResources, {
@@ -91,7 +94,7 @@
       ContinueLearning,
       ExploreChannels,
       LearnAppBarPage,
-      MissingResourceAlert,
+      ResourceSyncingUiAlert,
     },
     mixins: [commonLearnStrings],
     setup() {
@@ -206,6 +209,7 @@
         displayExploreChannels,
         displayClasses,
         missingResources,
+        hydrateHomePage,
       };
     },
     props: {
diff --git a/kolibri/plugins/learn/assets/src/views/HybridLearningContentCard/HybridLearningFooter.vue b/kolibri/plugins/learn/assets/src/views/HybridLearningContentCard/HybridLearningFooter.vue
index c27bb89db76..ae6eb1d96fa 100644
--- a/kolibri/plugins/learn/assets/src/views/HybridLearningContentCard/HybridLearningFooter.vue
+++ b/kolibri/plugins/learn/assets/src/views/HybridLearningContentCard/HybridLearningFooter.vue
@@ -57,7 +57,8 @@
         :style="{
           left: isRtl ? '16px' : 'auto',
           right: isRtl ? 'auto' : '16px',
-          position: 'absolute'
+          position: 'absolute',
+          zIndex: 7,
         }"
         :raised="true"
         :isOpen="isMenuOpen"
@@ -195,7 +196,7 @@
         this.disableRequestButtons = false;
       },
       confirmRemoveRequest() {
-        this.removeDownloadRequest(this.contentNode).then(() => {
+        this.removeDownloadRequest(this.contentNode.id).then(() => {
           this.removeConfirmationModalOpen = false;
         });
       },
diff --git a/kolibri/plugins/learn/assets/src/views/LearnExamReportViewer.vue b/kolibri/plugins/learn/assets/src/views/LearnExamReportViewer.vue
index 561ecc9c6ac..bfe3a49f68f 100644
--- a/kolibri/plugins/learn/assets/src/views/LearnExamReportViewer.vue
+++ b/kolibri/plugins/learn/assets/src/views/LearnExamReportViewer.vue
@@ -5,7 +5,8 @@
     :appBarTitle="exam.title || ''"
   >
     <KPageContainer :topMargin="50" class="container">
-      <div v-if="exerciseContentNodes && exerciseContentNodes.length">
+      <KCircularLoader v-if="loading" />
+      <div v-else-if="exerciseContentNodes && exerciseContentNodes.length">
         <ExamReport
           :contentId="exam.id"
           :title="exam.title"
@@ -67,6 +68,7 @@
       ...mapState({
         userName: state => state.core.session.full_name,
         userId: state => state.core.session.user_id,
+        loading: state => state.core.loading,
       }),
       homePageLink() {
         return {
diff --git a/kolibri/plugins/learn/assets/src/views/LibraryPage/MoreNetworkDevices.vue b/kolibri/plugins/learn/assets/src/views/LibraryPage/MoreNetworkDevices.vue
deleted file mode 100644
index 176509c5947..00000000000
--- a/kolibri/plugins/learn/assets/src/views/LibraryPage/MoreNetworkDevices.vue
+++ /dev/null
@@ -1,106 +0,0 @@
-<template>
-
-  <div>
-    <KGrid>
-      <KGridItem
-        v-for="device in devices"
-        :key="device.id"
-        :layout="{ span: layoutSpan }"
-      >
-        <UnPinnedDevices
-          :device="device"
-          :routeTo="genLibraryPageBackLink(device.id, false)"
-        />
-      </KGridItem>
-      <KGridItem
-        v-if="devices.length"
-        key="view-all"
-        :layout="{ span: layoutSpan }"
-      >
-        <UnPinnedDevices
-          :device="{}"
-          :viewAll="true"
-          :routeTo="genLibraryPageBackLink(null, true)"
-        />
-      </KGridItem>
-    </KGrid>
-  </div>
-
-</template>
-
-
-<script>
-
-  import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
-  import useContentLink from '../../composables/useContentLink';
-  import UnPinnedDevices from './UnPinnedDevices';
-
-  export default {
-    name: 'MoreNetworkDevices',
-    components: {
-      UnPinnedDevices,
-    },
-    mixins: [commonCoreStrings],
-    setup() {
-      const { genLibraryPageBackLink } = useContentLink();
-      return {
-        genLibraryPageBackLink,
-      };
-    },
-    inject: ['$layoutSpan'],
-    props: {
-      devices: {
-        type: Array,
-        required: true,
-      },
-    },
-    computed: {
-      layoutSpan() {
-        return this.$layoutSpan();
-      },
-    },
-  };
-
-</script>
-
-
-<style lang="scss"  scoped>
-
-  @import '~kolibri-design-system/lib/styles/definitions';
-  @import '../HybridLearningContentCard/card';
-
-  $margin: 24px;
-
-  .card-main-wrapper {
-    @extend %dropshadow-1dp;
-
-    position: relative;
-    display: inline-flex;
-    width: 100%;
-    max-height: 258px;
-    padding-bottom: $margin;
-    text-decoration: none;
-    vertical-align: top;
-    border-radius: $radius;
-    transition: box-shadow $core-time ease;
-
-    &:hover {
-      @extend %dropshadow-8dp;
-    }
-
-    &:focus {
-      outline-width: 4px;
-      outline-offset: 6px;
-    }
-  }
-
-  .cardgroup .card-main-wrapper {
-    display: inline-flex;
-  }
-
-  .device-name {
-    padding-left: 10px;
-    text-transform: uppercase;
-  }
-
-</style>
diff --git a/kolibri/plugins/learn/assets/src/views/LibraryPage/OtherLibraries.vue b/kolibri/plugins/learn/assets/src/views/LibraryPage/OtherLibraries.vue
new file mode 100644
index 00000000000..c6983f99b89
--- /dev/null
+++ b/kolibri/plugins/learn/assets/src/views/LibraryPage/OtherLibraries.vue
@@ -0,0 +1,245 @@
+<template>
+
+  <div>
+    <KGrid gutter="12">
+      <KGridItem
+        :layout12="{ span: 6 }"
+        :layout8="{ span: 4 }"
+        :layout4="{ span: 4 }"
+      >
+        <h1>
+          {{ injectedtr('otherLibraries') }}
+        </h1>
+      </KGridItem>
+      <KGridItem
+        :layout12="{ span: 6 }"
+        :layout8="{ span: 4 }"
+        :layout4="{ span: 4 }"
+      >
+        <div class="sync-status">
+          <span
+            v-show="searchingOtherLibraries"
+            data-test="searching"
+          >
+            <span data-test="searching-label">{{ injectedtr('searchingOtherLibrary') }}</span>
+                &nbsp;&nbsp;
+            <span>
+              <KCircularLoader
+                type="indeterminate"
+                :stroke="6"
+              />
+            </span>
+          </span>
+          <span
+            v-show="!searchingOtherLibraries && devicesWithChannelsExist"
+            data-test="showing-all"
+          >
+            <span>
+              <KIcon
+                v-if="windowIsSmall"
+                icon="wifi"
+                class="wifi-svg"
+              />
+            </span>
+                &nbsp;&nbsp;
+            <span data-test="showing-all-label">{{ injectedtr('showingAllLibraries') }}</span>
+                &nbsp;&nbsp;
+            <span>
+              <KIcon
+                v-if="!windowIsSmall"
+                icon="wifi"
+                class="wifi-svg"
+              />
+            </span>
+          </span>
+          <span
+            v-show="!searchingOtherLibraries && !devicesWithChannelsExist"
+            data-test="no-other"
+          >
+            <span>
+              <KIcon icon="disconnected" />
+            </span>
+                &nbsp;&nbsp;
+            <span data-test="no-other-label">{{ injectedtr('noOtherLibraries') }}</span>
+          </span>
+        </div>
+      </KGridItem>
+    </KGrid>
+
+    <h2
+      v-if="!threeLibrariesOrFewer && pinnedDevicesExist && unpinnedDevicesExist"
+      data-test="pinned-label"
+    >
+      {{ injectedtr('pinned') }}
+    </h2>
+    <FadeInTransitionGroup>
+      <LibraryItem
+        v-for="device in fullLibrariesToDisplay"
+        :key="device['instance_id']"
+        data-test="pinned-resources"
+        :device="device"
+        :channels="deviceChannelsMap[device['instance_id']]"
+        :channelsToDisplay="cardsToDisplay"
+        :pinned="Boolean(userPinsMap[device['instance_id']])"
+        @togglePin="handlePinToggle"
+      />
+    </FadeInTransitionGroup>
+
+    <!-- More  -->
+
+    <KGrid v-if="!threeLibrariesOrFewer && unpinnedDevicesExist">
+      <KGridItem
+        :layout12="{ span: 10 }"
+        :layout8="{ span: 6 }"
+        :layout4="{ span: 2 }"
+      >
+        <h2
+          v-if="pinnedDevicesExist"
+          data-test="more-label"
+          :style="{ marginTop: '0px' }"
+        >
+          {{ injectedtr('moreLibraries') }}
+        </h2>
+      </KGridItem>
+      <KGridItem
+        :layout12="{ span: 2, alignment: 'right' }"
+        :layout8="{ span: 2, alignment: 'right' }"
+        :layout4="{ span: 2, alignment: 'right' }"
+      >
+        <KRouterLink
+          appearance="raised-button"
+          :text="explore$"
+          :to="genExploreLibrariesPageBackLink()"
+        />
+      </KGridItem>
+      <KGridItem
+        v-for="device in unpinnedDevices.slice(0, cardsToDisplay)"
+        :key="device.id"
+        :layout="{ span: layoutSpan }"
+      >
+        <UnPinnedDevices
+          data-test="more-devices"
+          :device="device"
+          :channelCount="deviceChannelsMap[device.instance_id].length"
+          :routeTo="genLibraryPageBackLink(device.id)"
+        />
+      </KGridItem>
+    </KGrid>
+  </div>
+
+</template>
+
+
+<script>
+
+  import { get } from '@vueuse/core';
+  import { computed } from 'kolibri.lib.vueCompositionApi';
+  import useKResponsiveWindow from 'kolibri.coreVue.composables.useKResponsiveWindow';
+  import coreStrings from 'kolibri.utils.coreStrings';
+  import useCardLayoutSpan from '../../composables/useCardLayoutSpan';
+  import useContentLink from '../../composables/useContentLink';
+  import useDevices from '../../composables/useDevices';
+  import usePinnedDevices from '../../composables/usePinnedDevices';
+  import LibraryItem from '../ExploreLibrariesPage/LibraryItem';
+  import FadeInTransitionGroup from '../FadeInTransitionGroup';
+  import UnPinnedDevices from './UnPinnedDevices';
+
+  export default {
+    name: 'OtherLibraries',
+    components: {
+      FadeInTransitionGroup,
+      LibraryItem,
+      UnPinnedDevices,
+    },
+    setup() {
+      const {
+        isLoadingChannels,
+        networkDevicesWithChannels,
+        keepDeviceChannelsUpdated,
+        deviceChannelsMap,
+      } = useDevices();
+      const {
+        handlePinToggle,
+        fetchPinsForUser,
+        pinnedDevices,
+        unpinnedDevices,
+        pinnedDevicesExist,
+        unpinnedDevicesExist,
+        userPinsMap,
+      } = usePinnedDevices(networkDevicesWithChannels);
+      const { windowIsSmall } = useKResponsiveWindow();
+      const { genExploreLibrariesPageBackLink, genLibraryPageBackLink } = useContentLink();
+      const { layoutSpan, makeComputedCardCount } = useCardLayoutSpan();
+
+      keepDeviceChannelsUpdated();
+
+      fetchPinsForUser();
+
+      const devicesWithChannelsExist = computed(() => get(networkDevicesWithChannels).length > 0);
+
+      // We want to display 2 rows of cards
+      // but always display at least 3 cards, if available.
+      const cardsToDisplay = makeComputedCardCount(2, 3);
+
+      const threeLibrariesOrFewer = computed(() => get(networkDevicesWithChannels).length <= 3);
+
+      // When there are three libraries or fewer, display all libraries fully.
+      const fullLibrariesToDisplay = computed(() =>
+        get(threeLibrariesOrFewer)
+          ? [...get(pinnedDevices), ...get(unpinnedDevices)]
+          : get(pinnedDevices)
+      );
+
+      // Make this conditional, as this import does not resolve properly
+      // under Jest, and causes problems.
+      // eslint-disable-next-line kolibri/vue-no-undefined-string-uses
+      const explore$ = coreStrings.$tr ? coreStrings.$tr('explore') : '';
+
+      return {
+        networkDevicesWithChannels,
+        devicesWithChannelsExist,
+        deviceChannelsMap,
+        searchingOtherLibraries: isLoadingChannels,
+        windowIsSmall,
+        fullLibrariesToDisplay,
+        pinnedDevices,
+        unpinnedDevices,
+        userPinsMap,
+        threeLibrariesOrFewer,
+        pinnedDevicesExist,
+        unpinnedDevicesExist,
+        handlePinToggle,
+        cardsToDisplay,
+        explore$,
+        genExploreLibrariesPageBackLink,
+        genLibraryPageBackLink,
+        layoutSpan,
+      };
+    },
+    props: {
+      injectedtr: { type: Function, required: true },
+    },
+  };
+
+</script>
+
+
+<style lang="scss" scoped>
+
+  .sync-status {
+    display: flex;
+    justify-content: flex-end;
+    margin: 30px 0 10px;
+
+    span {
+      display: inline-flex;
+      vertical-align: bottom;
+    }
+  }
+
+  .wifi-svg {
+    top: 0;
+    transform: scale(1.5);
+  }
+
+</style>
diff --git a/kolibri/plugins/learn/assets/src/views/LibraryPage/PinnedNetworkResources.vue b/kolibri/plugins/learn/assets/src/views/LibraryPage/PinnedNetworkResources.vue
deleted file mode 100644
index d1515ecc694..00000000000
--- a/kolibri/plugins/learn/assets/src/views/LibraryPage/PinnedNetworkResources.vue
+++ /dev/null
@@ -1,102 +0,0 @@
-<template>
-
-  <!-- eslint-disable vue/html-indent -->
-
-  <KGrid v-if="devices !== null">
-    <KGridItem
-      v-for="device in devices"
-      :key="device.id"
-    >
-      <KGridItem>
-        <h2>
-          <KIcon :icon="getDeviceIcon(device)" />
-          <span class="device-name">{{ device.device_name }}</span>
-        </h2>
-      </KGridItem>
-      <ChannelCardGroupGrid
-        data-test="channel-cards"
-        :deviceId="device.id"
-        :contents="device.channels"
-        :isRemote="true"
-      >
-        <KGridItem :layout="{ span: layoutSpan }">
-          <ChannelCard
-            :key="exploreString.toLowerCase()"
-            :isMobile="windowIsSmall"
-            :title="exploreString"
-            :link="genLibraryPageBackLink(device.id, false)"
-            :explore="true"
-          />
-        </KGridItem>
-      </ChannelCardGroupGrid>
-
-    </KGridItem>
-  </KGrid>
-
-</template>
-
-
-<script>
-
-  import useKResponsiveWindow from 'kolibri.coreVue.composables.useKResponsiveWindow';
-  import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
-  import useContentLink from '../../composables/useContentLink';
-  import ChannelCard from '../ChannelCard';
-  import ChannelCardGroupGrid from './../ChannelCardGroupGrid';
-
-  export default {
-    name: 'PinnedNetworkResources',
-    components: {
-      ChannelCard,
-      ChannelCardGroupGrid,
-    },
-    mixins: [commonCoreStrings],
-    setup() {
-      const { genLibraryPageBackLink } = useContentLink();
-      const { windowIsSmall } = useKResponsiveWindow();
-      return {
-        genLibraryPageBackLink,
-        windowIsSmall,
-      };
-    },
-    props: {
-      devices: {
-        type: Array,
-        required: true,
-        default() {
-          return [];
-        },
-      },
-    },
-    computed: {
-      layoutSpan() {
-        return this.$layoutSpan();
-      },
-      exploreString() {
-        return this.coreString('explore');
-      },
-    },
-    inject: ['$layoutSpan'],
-    methods: {
-      getDeviceIcon(device) {
-        if (device['operating_system'] === 'Android') {
-          return 'device';
-        } else if (!device['subset_of_users_device']) {
-          return 'cloud';
-        } else {
-          return 'laptop';
-        }
-      },
-    },
-  };
-
-</script>
-
-
-<style lang="scss"  scoped>
-
-  .device-name {
-    padding-left: 10px;
-  }
-
-</style>
diff --git a/kolibri/plugins/learn/assets/src/views/LibraryPage/UnPinnedDevices.vue b/kolibri/plugins/learn/assets/src/views/LibraryPage/UnPinnedDevices.vue
index bceedc06490..a237db31b7f 100644
--- a/kolibri/plugins/learn/assets/src/views/LibraryPage/UnPinnedDevices.vue
+++ b/kolibri/plugins/learn/assets/src/views/LibraryPage/UnPinnedDevices.vue
@@ -71,6 +71,10 @@
         type: Object,
         required: true,
       },
+      channelCount: {
+        type: Number,
+        default: 0,
+      },
       routeTo: {
         type: Object,
         required: true,
@@ -90,9 +94,6 @@
           textAlign: 'center',
         };
       },
-      channelCount() {
-        return this.device['total_count'] || 0;
-      },
       deviceName() {
         return this.device.nickname || this.device.device_name;
       },
diff --git a/kolibri/plugins/learn/assets/src/views/LibraryPage/index.vue b/kolibri/plugins/learn/assets/src/views/LibraryPage/index.vue
index 0b1ff594e7d..e56a4419d02 100644
--- a/kolibri/plugins/learn/assets/src/views/LibraryPage/index.vue
+++ b/kolibri/plugins/learn/assets/src/views/LibraryPage/index.vue
@@ -63,113 +63,12 @@
           @setCardStyle="style => currentCardViewStyle = style"
           @setSidePanelMetadataContent="content => metadataSidePanelContent = content"
         />
-        <!-- Other Libraires -->
-        <div
+        <!-- Other Libraries -->
+        <OtherLibraries
           v-if="!deviceId && isUserLoggedIn"
           data-test="other-libraries"
-        >
-          <KGrid gutter="12">
-            <KGridItem
-              :layout12="{ span: 6 }"
-              :layout8="{ span: 4 }"
-              :layout4="{ span: 4 }"
-            >
-              <h1>
-                {{ $tr('otherLibraries') }}
-              </h1>
-            </KGridItem>
-            <KGridItem
-              :layout12="{ span: 6 }"
-              :layout8="{ span: 4 }"
-              :layout4="{ span: 4 }"
-            >
-              <div class="sync-status">
-                <span
-                  v-show="searching"
-                  data-test="searching"
-                >
-                  <span data-test="searching-label">{{ $tr('searchingOtherLibrary') }}</span>
-                  &nbsp;&nbsp;
-                  <span>
-                    <KCircularLoader
-                      type="indeterminate"
-                      :stroke="6"
-                    />
-                  </span>
-                </span>
-                <span
-                  v-show="!searching && devicesWithChannelsExist"
-                  data-test="showing-all"
-                >
-                  <span>
-                    <KIcon
-                      v-if="windowIsSmall"
-                      icon="wifi"
-                      class="wifi-svg"
-                    />
-                  </span>
-                  &nbsp;&nbsp;
-                  <span data-test="showing-all-label">{{ showingAllLibrariesLabel }}</span>
-                  &nbsp;&nbsp;
-                  <KButton
-                    :text="coreString('refresh')"
-                    appearance="basic-link"
-                    @click="refreshDevices"
-                  />
-                  &nbsp;&nbsp;
-                  <span>
-                    <KIcon
-                      v-if="!windowIsSmall"
-                      icon="wifi"
-                      class="wifi-svg"
-                    />
-                  </span>
-                </span>
-                <span
-                  v-show="!searching && !devicesWithChannelsExist"
-                  data-test="no-other"
-                >
-                  <span>
-                    <KIcon icon="disconnected" />
-                  </span>
-                  &nbsp;&nbsp;
-                  <span data-test="no-other-label">{{ $tr('noOtherLibraries') }}</span>
-                  &nbsp;&nbsp;
-                  <KButton
-                    :text="coreString('refresh')"
-                    appearance="basic-link"
-                    @click="refreshDevices"
-                  />
-                </span>
-              </div>
-            </KGridItem>
-          </KGrid>
-
-          <h2
-            v-if="pinnedDevicesExist && unpinnedDevicesExist"
-            data-test="pinned-label"
-          >
-            {{ $tr('pinned') }}
-          </h2>
-          <PinnedNetworkResources
-            v-if="pinnedDevicesExist"
-            data-test="pinned-resources"
-            :devices="pinnedDevices"
-          />
-
-          <!-- More  -->
-          <h2
-            v-if="pinnedDevicesExist && unpinnedDevicesExist"
-            data-test="more-label"
-          >
-            {{ $tr('moreLibraries') }}
-          </h2>
-          <MoreNetworkDevices
-            v-if="unpinnedDevicesExist"
-            data-test="more-devices"
-            :devices="unpinnedDevices"
-          />
-        </div>
+          :injectedtr="injecttr"
+        />
 
       </div>
 
@@ -247,13 +146,11 @@
 <script>
 
   import { get, set } from '@vueuse/core';
-  import cloneDeep from 'lodash/cloneDeep';
 
   import { onMounted, getCurrentInstance, ref, watch } from 'kolibri.lib.vueCompositionApi';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
   import useKResponsiveWindow from 'kolibri.coreVue.composables.useKResponsiveWindow';
   import useUser from 'kolibri.coreVue.composables.useUser';
-  import { currentLanguage } from 'kolibri.utils.i18n';
   import samePageCheckGenerator from 'kolibri.utils.samePageCheckGenerator';
   import { ContentNodeResource } from 'kolibri.resources';
   import SidePanelModal from '../SidePanelModal';
@@ -262,11 +159,11 @@
   import useCardViewStyle from '../../composables/useCardViewStyle';
   import useContentLink from '../../composables/useContentLink';
   import useCoreLearn from '../../composables/useCoreLearn';
-  import useDevices, {
+  import {
+    currentDeviceData,
     setCurrentDevice,
     StudioNotAllowedError,
   } from '../../composables/useDevices';
-  import usePinnedDevices from '../../composables/usePinnedDevices';
   import useSearch, { searchKeys } from '../../composables/useSearch';
   import useLearnerResources from '../../composables/useLearnerResources';
   import BrowseResourceMetadata from '../BrowseResourceMetadata';
@@ -277,8 +174,7 @@
   import LearnAppBarPage from '../LearnAppBarPage';
   import useChannels from './../../composables/useChannels';
   import ResumableContentGrid from './ResumableContentGrid';
-  import PinnedNetworkResources from './PinnedNetworkResources';
-  import MoreNetworkDevices from './MoreNetworkDevices';
+  import OtherLibraries from './OtherLibraries';
 
   export default {
     name: 'LibraryPage',
@@ -296,8 +192,7 @@
       SearchResultsGrid,
       SearchFiltersPanel,
       LearnAppBarPage,
-      PinnedNetworkResources,
-      MoreNetworkDevices,
+      OtherLibraries,
     },
     mixins: [commonLearnStrings, commonCoreStrings],
     setup(props) {
@@ -336,9 +231,8 @@
       const { canAddDownloads, canDownloadExternally } = useCoreLearn();
       const { currentCardViewStyle } = useCardViewStyle();
       const { back } = useContentLink();
-      const { baseurl, deviceName, fetchDevices } = useDevices();
+      const { baseurl, deviceName } = currentDeviceData();
       const { fetchChannels } = useChannels();
-      const { fetchPinsForUser } = usePinnedDevices();
 
       onMounted(() => {
         const keywords = currentRoute().query.keywords;
@@ -426,6 +320,7 @@
 
       function showLibrary() {
         set(rootNodesLoading, true);
+        store.commit('CORE_SET_PAGE_LOADING', true);
         if (props.deviceId) {
           return setCurrentDevice(props.deviceId)
             .then(device => {
@@ -471,10 +366,8 @@
         windowIsSmall,
         currentCardViewStyle,
         baseurl,
-        fetchDevices,
         deviceName,
         fetchChannels,
-        fetchPinsForUser,
         back,
         rootNodesLoading,
         rootNodes,
@@ -492,9 +385,6 @@
         isLocalLibraryEmpty: false,
         metadataSidePanelContent: null,
         mobileSidePanelIsOpen: false,
-        devices: [],
-        searching: true,
-        usersPins: [],
       };
     },
     computed: {
@@ -515,19 +405,6 @@
           return this.coreString('yourLibrary');
         }
       },
-      channelsToDisplay() {
-        return this.windowIsSmall ? 3 : 5;
-      },
-      devicesWithChannels() {
-        //display Kolibri studio for superusers only
-        return cloneDeep(this.devices).filter(device => {
-          device['channels'] = device.channels?.slice(0, this.channelsToDisplay);
-          return device.channels?.length > 0;
-        });
-      },
-      devicesWithChannelsExist() {
-        return this.devicesWithChannels.length > 0;
-      },
       gridOffset() {
         const marginTop =
           !this.windowIsLarge && (this.isLocalLibraryEmpty || this.deviceId) ? '140px' : '110px';
@@ -535,41 +412,6 @@
           ? { marginRight: `${this.sidePanelWidth + 24}px`, marginTop }
           : { marginLeft: `${this.sidePanelWidth + 24}px`, marginTop };
       },
-      layoutSpan() {
-        /**
-         * The breakpoints below represent the window widths
-         * 0: < 480px  | Small screen  | 4 columns
-         * 1: < 600px  | Small screen  | 4 columns
-         * 2: < 840px  | Medium screen | 8 columns
-         * 3: < 960px  | Large screen  | 12 columns
-         * 4: < 1280px | Large screen  | 12 columns
-         * 5: < 1440px | Large screen  | 12 columns
-         * 6: < 1600px | Large screen  | 12 columns
-         *
-         * On resize, display X cards per row where:
-         * X = total columns in grid / column span for each card.
-         * For example, if the total number of columns is 12, and
-         * column span for each cards is 4, then X is 3.
-         */
-        let span = 3;
-        if ([0, 1, 2, 6].includes(this.windowBreakpoint)) {
-          span = 4;
-        } else if ([3, 4, 5].includes(this.windowBreakpoint)) {
-          span = 4;
-        }
-        return span;
-      },
-      pinnedDevices() {
-        return this.devicesWithChannels.filter(device => {
-          return (
-            this.usersPinsDeviceIds.includes(device.instance_id) ||
-            device.instance_id === this.studioId
-          );
-        });
-      },
-      pinnedDevicesExist() {
-        return this.pinnedDevices.length > 0;
-      },
       sidePanelWidth() {
         if (
           this.windowIsSmall ||
@@ -583,32 +425,9 @@
           return 346;
         }
       },
-      showingAllLibrariesLabel() {
-        const label = this.$tr('showingAllLibraries');
-        return label;
-      },
       studioId() {
         return KolibriStudioId;
       },
-      unpinnedDevices() {
-        return this.devicesWithChannels.filter(device => {
-          return (
-            !this.usersPinsDeviceIds.includes(device.instance_id) &&
-            device.instance_id !== this.studioId
-          );
-        });
-      },
-      unpinnedDevicesExist() {
-        return this.unpinnedDevices.length > 0;
-      },
-      usersPinsDeviceIds() {
-        return this.usersPins.map(pin => pin.instance_id);
-      },
-    },
-    provide() {
-      return {
-        $layoutSpan: () => this.layoutSpan,
-      };
     },
     watch: {
       rootNodes(newNodes) {
@@ -632,58 +451,25 @@
       if (window.sessionStorage.getItem(welcomeDismissalKey) !== 'true') {
         this.$store.commit('SET_WELCOME_MODAL_VISIBLE', true);
       }
-      if (this.isUserLoggedIn) {
-        this.refreshDevices();
-      }
     },
     methods: {
-      addDevice(device, channels) {
-        this.devices.push(
-          Object.assign(device, {
-            channels: channels.sort(this.currentLanguageChannelsFirst),
-            total_count: channels.length,
-          })
-        );
-      },
-      currentLanguageChannelsFirst(a, b) {
-        return b['lang_code'].indexOf(currentLanguage) - a['lang_code'].indexOf(currentLanguage);
-      },
       findFirstEl() {
         this.$refs.resourcePanel.focusFirstEl();
       },
-      refreshDevices() {
-        this.searching = true;
-        this.devices = [];
-        this.fetchPinsForUser().then(resp => {
-          this.usersPins = resp.map(pin => {
-            const instance_id = pin.instance_id.replace(/-/g, '');
-            return { ...pin, instance_id };
-          });
-        });
-
-        this.fetchDevices().then(devices => {
-          this.searching = false;
-          for (const device of devices) {
-            const baseurl = device.base_url;
-            this.fetchChannels({ baseurl })
-              .then(channels => {
-                this.addDevice(device, channels);
-              })
-              .catch(() => {
-                this.addDevice(device, []);
-              });
-          }
-        });
-      },
       toggleSidePanelVisibility() {
         this.mobileSidePanelIsOpen = !this.mobileSidePanelIsOpen;
       },
+      injecttr(...args) {
+        return this.$tr(...args);
+      },
     },
     $trs: {
       libraryOf: {
         message: 'Library of {device}',
         context: 'A header for a device Library',
       },
+      /* eslint-disable kolibri/vue-no-unused-translations */
+      // These are mostly used in the OtherLibraries component and passed in from here.
       otherLibraries: {
         message: 'Other libraries',
         context: 'Header for viewing other remote content Library',
@@ -692,12 +478,10 @@
         message: 'Searching for libraries around you.',
         context: 'Connection state for showing other library',
       },
-      /* eslint-disable kolibri/vue-no-unused-translations */
       noOtherLibraries: {
         message: 'No other libraries around you right now',
         context: 'Connection state when there is no other libraries around',
       },
-      /* eslint-enable kolibri/vue-no-unused-translations */
       showingAllLibraries: {
         message: 'Showing all available libraries around you.',
         context: 'Connection state when the device is connected and shows other libraries',
@@ -710,6 +494,7 @@
         message: 'Pinned',
         context: 'Sub heading for the pinned devices',
       },
+      /* eslint-enable kolibri/vue-no-unused-translations */
     },
   };
 
@@ -783,30 +568,4 @@
     margin-left: 8px;
   }
 
-  .sync-status {
-    display: flex;
-    justify-content: flex-end;
-    margin: 30px 0 10px;
-
-    span {
-      display: inline-flex;
-      vertical-align: bottom;
-    }
-  }
-
-  .network-device-refresh {
-    display: inline-block;
-    margin: 0 4px;
-  }
-
-  .view-all-text {
-    margin: auto;
-    font-size: 16px;
-  }
-
-  .wifi-svg {
-    top: 0;
-    transform: scale(1.5);
-  }
-
 </style>
diff --git a/kolibri/plugins/learn/assets/src/views/ResourceSyncingUiAlert.vue b/kolibri/plugins/learn/assets/src/views/ResourceSyncingUiAlert.vue
new file mode 100644
index 00000000000..a1a13d4c71b
--- /dev/null
+++ b/kolibri/plugins/learn/assets/src/views/ResourceSyncingUiAlert.vue
@@ -0,0 +1,81 @@
+<template>
+
+  <MissingResourceAlert
+    :multiple="multiple"
+  >
+    <template v-if="isLearnerOnlyImport && isSyncing" #syncAlert>
+      {{ syncMessage }}
+    </template>
+  </MissingResourceAlert>
+
+</template>
+
+
+<script>
+
+  import { get } from '@vueuse/core';
+  import { computed, watch } from 'kolibri.lib.vueCompositionApi';
+  import MissingResourceAlert from 'kolibri-common/components/MissingResourceAlert.vue';
+  import useUserSyncStatus from 'kolibri.coreVue.composables.useUserSyncStatus';
+  import { SyncStatus } from 'kolibri.coreVue.vuex.constants';
+  import { createTranslator } from 'kolibri.utils.i18n';
+  import useUser from 'kolibri.coreVue.composables.useUser';
+
+  const syncStatusDescriptionStrings = createTranslator('SyncStatusDescription', {
+    syncingDescription: {
+      message: 'The device is currently syncing.',
+      context: 'Description of the device syncing status.',
+    },
+    queuedDescription: {
+      message: 'The device is waiting to sync.',
+      context: 'Description of the device syncing status',
+    },
+  });
+
+  export default {
+    name: 'ResourceSyncingUiAlert',
+    components: {
+      MissingResourceAlert,
+    },
+    setup(props, { emit }) {
+      const { status, syncDownloadsInProgress } = useUserSyncStatus();
+      const { isLearnerOnlyImport } = useUser();
+      const isSyncing = computed(() => {
+        return (
+          get(status) === SyncStatus.QUEUED ||
+          get(status) === SyncStatus.SYNCING ||
+          get(syncDownloadsInProgress)
+        );
+      });
+
+      watch(isSyncing, (newVal, oldVal) => {
+        if (newVal === false && oldVal === true) {
+          emit('syncComplete');
+        }
+      });
+
+      return {
+        status,
+        syncDownloadsInProgress,
+        isLearnerOnlyImport,
+        isSyncing,
+      };
+    },
+    props: {
+      multiple: {
+        type: Boolean,
+        default: true,
+      },
+    },
+    computed: {
+      syncMessage() {
+        /* eslint-disable kolibri/vue-no-undefined-string-uses */
+        return this.status == SyncStatus.QUEUED
+          ? syncStatusDescriptionStrings.$tr('queuedDescription')
+          : syncStatusDescriptionStrings.$tr('syncingDescription');
+        /* eslint-enable */
+      },
+    },
+  };
+
+</script>
diff --git a/kolibri/plugins/learn/assets/src/views/TopicsContentPage.vue b/kolibri/plugins/learn/assets/src/views/TopicsContentPage.vue
index 46c7fcff04d..e80c144d962 100644
--- a/kolibri/plugins/learn/assets/src/views/TopicsContentPage.vue
+++ b/kolibri/plugins/learn/assets/src/views/TopicsContentPage.vue
@@ -23,7 +23,7 @@
       :allowMarkComplete="allowMarkComplete"
       :contentKind="contentKind"
       :showBookmark="allowBookmark"
-      :showDownloadButton="allowRemoteDownload"
+      :showDownloadButton="showDownloadButton"
       :isDownloading="isDownloading"
       :downloadingLoaderTooltip="downloadRequestsTranslator.$tr('downloadStartedLabel')"
       data-test="learningActivityBar"
@@ -129,10 +129,10 @@
       <AlsoInThis
         style="margin-top: 8px"
         :contentNodes="viewResourcesContents"
-        :nextContent="nextContent"
+        :nextFolder="nextFolder"
         :isLesson="lessonContext"
         :loading="resourcesSidePanelLoading"
-        :currentResourceID="currentResourceID"
+        :currentResourceId="currentResourceId"
         :missingLessonResources="missingLessonResources"
       />
     </SidePanelModal>
@@ -154,7 +154,7 @@
 <script>
 
   import { mapState } from 'vuex';
-  import { set } from '@vueuse/core';
+  import { get, set } from '@vueuse/core';
   import lodashGet from 'lodash/get';
   import responsiveWindowMixin from 'kolibri.coreVue.mixins.responsiveWindowMixin';
   import { getCurrentInstance, ref, watch } from 'kolibri.lib.vueCompositionApi';
@@ -178,7 +178,11 @@
   import useContentLink from '../composables/useContentLink';
   import useCoreLearn from '../composables/useCoreLearn';
   import useContentNodeProgress from '../composables/useContentNodeProgress';
-  import useDevices, { setCurrentDevice, StudioNotAllowedError } from '../composables/useDevices';
+  import {
+    currentDeviceData,
+    setCurrentDevice,
+    StudioNotAllowedError,
+  } from '../composables/useDevices';
   import useLearnerResources from '../composables/useLearnerResources';
   import useDownloadRequests from '../composables/useDownloadRequests';
   import commonLearnStrings from './commonLearnStrings';
@@ -225,7 +229,7 @@
       const currentInstance = getCurrentInstance().proxy;
       const store = currentInstance.$store;
       const router = currentInstance.$router;
-      const { canDownloadExternally } = useCoreLearn();
+      const { canDownloadExternally, canAddDownloads } = useCoreLearn();
       const {
         fetchContentNodeProgress,
         fetchContentNodeTreeProgress,
@@ -234,12 +238,13 @@
       const { channelsMap, fetchChannels } = useChannels();
       const { fetchLesson } = useLearnerResources();
       const { back, genExternalBackURL } = useContentLink();
-      const { baseurl, deviceName } = useDevices();
+      const { baseurl, deviceName } = currentDeviceData();
       const {
         addDownloadRequest,
-        isDownloadedByLearner,
-        isDownloadingByLearner,
+        downloadRequestMap,
         downloadRequestsTranslator,
+        pollUserDownloadRequests,
+        loading: downloadRequestLoading,
       } = useDownloadRequests();
       const deviceFormTranslator = crossComponentTranslator(AddDeviceForm);
       const { currentUserId, isUserLoggedIn, isCoach, isAdmin, isSuperuser } = useUser();
@@ -286,8 +291,9 @@
         if (deviceId) {
           promise = setCurrentDevice(deviceId).then(device => {
             const baseurl = device.base_url;
-            const { fetchUserDownloadRequests } = useDownloadRequests(store);
-            fetchUserDownloadRequests({ page: 1, pageSize: 20 });
+            if (get(canAddDownloads)) {
+              pollUserDownloadRequests({ contentnode_id: props.id });
+            }
             return _loadTopicsContent(shouldResolve, baseurl);
           });
         } else {
@@ -318,16 +324,17 @@
         fetchContentNodeProgress,
         fetchContentNodeTreeProgress,
         fetchLesson,
+        canAddDownloads,
         back,
         genExternalBackURL,
         addDownloadRequest,
-        isDownloadedByLearner,
-        isDownloadingByLearner,
+        downloadRequestMap,
         downloadRequestsTranslator,
         deviceFormTranslator,
         content,
         channel,
         loading,
+        downloadRequestLoading,
         isUserLoggedIn,
         isCoach,
         isAdmin,
@@ -362,7 +369,7 @@
         bookmark: null,
         sidePanelContent: null,
         showViewResourcesSidePanel: false,
-        nextContent: null,
+        nextFolder: null,
         viewResourcesContents: [],
         resourcesSidePanelFetched: false,
         resourcesSidePanelLoading: false,
@@ -432,8 +439,8 @@
       timeSpent() {
         return this.contentPageMounted ? this.$refs.contentPage.time_spent : 0;
       },
-      currentResourceID() {
-        return this.content ? this.content.content_id : '';
+      currentResourceId() {
+        return this.content ? this.content.id : '';
       },
       missingLessonResources() {
         return this.lesson && this.lesson.resources.some(c => !c.contentnode);
@@ -441,15 +448,35 @@
       isRemoteContent() {
         return Boolean(this.deviceId);
       },
+      allowDownloads() {
+        return this.isUserLoggedIn && this.canAddDownloads && this.isRemoteContent;
+      },
+      downloadRequestedByLearner() {
+        return this.allowDownloads && Boolean(this.downloadRequestMap[this.content?.id]);
+      },
+      downloadableByLearner() {
+        return this.allowDownloads && !this.content?.admin_imported;
+      },
       isDownloading() {
-        return this.isDownloadingByLearner(this.content);
+        return (
+          this.downloadRequestedByLearner &&
+          this.downloadRequestMap[this.content.id].status === 'PENDING'
+        );
       },
       isDownloaded() {
-        if (!this.content) return false;
-        return this.content.admin_imported || this.isDownloadedByLearner(this.content);
+        return (
+          this.content?.admin_imported ||
+          (this.downloadRequestedByLearner &&
+            this.downloadRequestMap[this.content?.id]?.status === 'COMPLETED')
+        );
       },
-      allowRemoteDownload() {
-        return this.isUserLoggedIn && this.isRemoteContent && !this.isDownloaded;
+      showDownloadButton() {
+        return (
+          this.downloadableByLearner &&
+          !this.downloadRequestLoading &&
+          !this.loading &&
+          !this.isDownloaded
+        );
       },
       allowBookmark() {
         return this.isUserLoggedIn && (!this.isRemoteContent || this.isDownloaded);
@@ -486,7 +513,7 @@
       initializeState() {
         this.bookmark = null;
         this.showViewResourcesSidePanel = false;
-        this.nextContent = null;
+        this.nextFolder = null;
         this.viewResourcesContents = [];
         this.resourcesSidePanelFetched = false;
         this.resourcesSidePanelLoading = false;
@@ -552,7 +579,7 @@
        * is a topic.
        *
        * @modifies this.viewResourcesContents - Sets it to the progress-mapped nodes
-       * @modifies this.nextContent - Sets the value with this.content's parents next sibling folder
+       * @modifies this.nextFolder - Sets the value with this.content's parents next sibling folder
        * if found
        * @modifies useContentNodeProgress.contentNodeProgressMap (indirectly) if the user
        * is logged in
@@ -576,19 +603,19 @@
         }
         return ContentNodeResource.fetchTree(treeParams).then(ancestor => {
           let parent;
-          let nextContents;
+          let nextFolders;
           if (fetchGrandparent) {
             const parentIndex = ancestor.children.results.findIndex(
               c => c.id === this.content.parent
             );
             parent = ancestor.children.results[parentIndex];
-            nextContents = ancestor.children.results.slice(parentIndex + 1);
+            nextFolders = ancestor.children.results.slice(parentIndex + 1);
           } else {
             parent = ancestor;
             const contentIndex = ancestor.children.results.findIndex(c => c.id === this.content.id);
-            nextContents = ancestor.children.results.slice(contentIndex + 1);
+            nextFolders = ancestor.children.results.slice(contentIndex + 1);
           }
-          this.nextContent = nextContents.find(c => c.kind === ContentNodeKinds.TOPIC) || null;
+          this.nextFolder = nextFolders.find(c => c.kind === ContentNodeKinds.TOPIC) || null;
           this.viewResourcesContents = parent.children.results.filter(n => n.id);
         });
       },
diff --git a/kolibri/plugins/learn/assets/src/views/TopicsPage/ToggleHeaderTabs.vue b/kolibri/plugins/learn/assets/src/views/TopicsPage/ToggleHeaderTabs.vue
index c97e1b89934..226f5dccb00 100644
--- a/kolibri/plugins/learn/assets/src/views/TopicsPage/ToggleHeaderTabs.vue
+++ b/kolibri/plugins/learn/assets/src/views/TopicsPage/ToggleHeaderTabs.vue
@@ -60,6 +60,9 @@
     props: {
       topic: {
         type: Object,
+        default() {
+          return {};
+        },
         required: true,
       },
       topics: {
diff --git a/kolibri/plugins/learn/assets/src/views/TopicsPage/TopicsPanelModal.vue b/kolibri/plugins/learn/assets/src/views/TopicsPage/TopicsPanelModal.vue
index d14699e9175..bfdc5495c49 100644
--- a/kolibri/plugins/learn/assets/src/views/TopicsPage/TopicsPanelModal.vue
+++ b/kolibri/plugins/learn/assets/src/views/TopicsPage/TopicsPanelModal.vue
@@ -25,7 +25,7 @@
           :text="t.title"
           class="side-panel-folder-link"
           :appearanceOverrides="{ color: $themeTokens.text }"
-          :to="genContentLinkBackLinkCurrentPage(t.id, false)"
+          :to="genContentLinkKeepCurrentBackLink(t.id, false)"
         />
       </div>
       <KButton
@@ -56,16 +56,16 @@
     mixins: [commonLearnStrings, commonCoreStrings],
     setup() {
       const { windowIsLarge } = useKResponsiveWindow();
-      const { genContentLinkBackLinkCurrentPage } = useContentLink();
+      const { genContentLinkKeepCurrentBackLink } = useContentLink();
       return {
-        genContentLinkBackLinkCurrentPage,
+        genContentLinkKeepCurrentBackLink,
         windowIsLarge,
       };
     },
     props: {
       topicMore: {
-        type: Object,
-        default: null,
+        type: Boolean,
+        default: false,
       },
       topics: {
         type: Array,
diff --git a/kolibri/plugins/learn/assets/src/views/TopicsPage/index.vue b/kolibri/plugins/learn/assets/src/views/TopicsPage/index.vue
index f3d5c9a048b..d82b8d8e81f 100644
--- a/kolibri/plugins/learn/assets/src/views/TopicsPage/index.vue
+++ b/kolibri/plugins/learn/assets/src/views/TopicsPage/index.vue
@@ -38,7 +38,7 @@
         >
           <template #sticky-sidebar>
             <ToggleHeaderTabs
-              v-if="!!windowIsLarge"
+              v-if="!!windowIsLarge && topic"
               :topic="topic"
               :topics="topics"
               :width="sidePanelWidth"
@@ -57,7 +57,7 @@
               ref="sidePanel"
               class="side-panel"
               :topics="topics"
-              :topicMore="topicMore"
+              :topicMore="Boolean(topicMore)"
               :topicsLoading="topicMoreLoading"
               :width="`${sidePanelWidth}px`"
               :style="sidePanelStyleOverrides"
@@ -187,7 +187,7 @@
             ref="embeddedPanel"
             class="full-screen-side-panel"
             :topics="topics"
-            :topicMore="topicMore"
+            :topicMore="Boolean(topicMore)"
             :topicsLoading="topicMoreLoading"
             :style="sidePanelStyleOverrides"
             @loadMoreTopics="handleLoadMoreInTopic"
@@ -361,14 +361,40 @@
       } = useSearch(topic);
       const { back, genContentLinkKeepCurrentBackLink } = useContentLink();
       const { channelsMap, fetchChannels } = useChannels();
-      const { fetchContentNodeTreeProgress } = useContentNodeProgress();
+      const { fetchContentNodeProgress, fetchContentNodeTreeProgress } = useContentNodeProgress();
       const { isUserLoggedIn, isCoach, isAdmin, isSuperuser } = useUser();
+      const { fetchUserDownloadRequests } = useDownloadRequests(store);
 
       const isRoot = ref(false);
       const channel = ref(null);
       const contents = ref([]);
       const loading = ref(true);
 
+      const _getAllDescendantChildren = topic => {
+        const contentnode_id__in = [];
+        const children = topic.children ? topic.children.results : [];
+        for (const child of children) {
+          if (child.kind === ContentNodeKinds.TOPIC) {
+            contentnode_id__in.push(..._getAllDescendantChildren(child));
+          } else {
+            contentnode_id__in.push(child.id);
+          }
+        }
+        return contentnode_id__in;
+      };
+
+      const fetchRemoteBrowsingContentNodeUserData = topic => {
+        if (get(isUserLoggedIn) && props.deviceId) {
+          const contentnode_id__in = _getAllDescendantChildren(topic);
+          if (contentnode_id__in.length) {
+            if (get(canAddDownloads)) {
+              fetchUserDownloadRequests({ contentnode_id__in });
+            }
+            fetchContentNodeProgress({ ids: contentnode_id__in });
+          }
+        }
+      };
+
       function _handleTopicRedirect(route, children, id, skipped) {
         if (!children.some(c => !c.is_leaf) && route.name !== PageNames.TOPICS_TOPIC_SEARCH) {
           // if there are no children which are not leaf nodes (i.e. they have children themselves)
@@ -378,7 +404,6 @@
             params: { ...route.params, id },
             query: route.query,
           });
-          return true;
         } else if (skipped) {
           // If we have skipped down the topic tree, replace to the new top level topic
           router.replace({ name: route.name, params: { ...route.params, id }, query: route.query });
@@ -419,7 +444,16 @@
 
             id = childrenResults.id;
 
-            _handleTopicRedirect(route, children, id, skipped);
+            const redirectedToNewTopic = _handleTopicRedirect(route, children, id, skipped);
+
+            if (redirectedToNewTopic) {
+              // If we have encountered the skip logic, we need to reload the topic
+              // with the new id, which will be triggered by our watch statement below
+              // so we can just return here
+              return;
+            }
+
+            fetchRemoteBrowsingContentNodeUserData(fetchedTopic);
 
             set(isRoot, rootTopic);
 
@@ -451,8 +485,6 @@
           if (props.deviceId) {
             promise = setCurrentDevice(props.deviceId).then(device => {
               const baseurl = device.base_url;
-              const { fetchUserDownloadRequests } = useDownloadRequests(store);
-              fetchUserDownloadRequests({ page: 1, pageSize: 100 });
               return _loadTopicsTopic({ baseurl, shouldResolve });
             });
           } else {
@@ -477,6 +509,7 @@
       showTopicsTopic();
 
       return {
+        fetchRemoteBrowsingContentNodeUserData,
         canAddDownloads,
         canDownloadExternally,
         searchTerms,
@@ -530,7 +563,7 @@
     },
     computed: {
       allowDownloads() {
-        return this.canAddDownloads && Boolean(this.deviceId);
+        return this.isUserLoggedIn && this.canAddDownloads && Boolean(this.deviceId);
       },
       barTitle() {
         return this.deviceId
@@ -827,7 +860,7 @@
         const parent = parentIndex > -1 ? this.contents[parentIndex] : null;
         const more = parent && parent.children && parent.children.more;
         if (more) {
-          if (this.isUserLoggedIn) {
+          if (this.isUserLoggedIn && !this.deviceId) {
             this.fetchContentNodeTreeProgress(more);
           }
           return ContentNodeResource.fetchTree(more)
@@ -840,6 +873,7 @@
                 child,
                 ...this.contents.slice(parentIndex + 1),
               ];
+              this.fetchRemoteBrowsingContentNodeUserData(data);
             })
             .catch(err => {
               this.$store.dispatch('handleApiError', { error: err });
@@ -855,7 +889,7 @@
       loadMoreTopics() {
         const more = this.topic.children.more;
         if (more) {
-          if (this.isUserLoggedIn) {
+          if (this.isUserLoggedIn && !this.deviceId) {
             this.fetchContentNodeTreeProgress(more);
           }
           return ContentNodeResource.fetchTree(more)
@@ -868,6 +902,7 @@
                   more: data.children.more,
                 },
               };
+              this.fetchRemoteBrowsingContentNodeUserData(data);
             })
             .catch(err => {
               this.$store.dispatch('handleApiError', { error: err });
@@ -970,6 +1005,7 @@
 
   .end-button-block {
     width: 100%;
+    padding-bottom: 16px;
     margin-top: 16px;
     text-align: center;
   }
diff --git a/kolibri/plugins/learn/assets/src/views/YourClasses/index.vue b/kolibri/plugins/learn/assets/src/views/YourClasses/index.vue
index eeee15c6789..ebe7e6cb083 100644
--- a/kolibri/plugins/learn/assets/src/views/YourClasses/index.vue
+++ b/kolibri/plugins/learn/assets/src/views/YourClasses/index.vue
@@ -39,6 +39,8 @@
       </CardLink>
     </CardGrid>
 
+    <KCircularLoader v-else-if="loading" />
+
     <p v-else-if="!loading">
       {{ $tr('noClasses') }}
     </p>
diff --git a/kolibri/plugins/learn/assets/src/views/classes/ClassAssignmentsPage.vue b/kolibri/plugins/learn/assets/src/views/classes/ClassAssignmentsPage.vue
index de3f175223b..40871cf1440 100644
--- a/kolibri/plugins/learn/assets/src/views/classes/ClassAssignmentsPage.vue
+++ b/kolibri/plugins/learn/assets/src/views/classes/ClassAssignmentsPage.vue
@@ -3,7 +3,8 @@
   <LearnAppBarPage
     :appBarTitle="learnString('learnLabel')"
   >
-    <div id="main" role="main">
+    <KCircularLoader v-if="loading" />
+    <div v-else id="main" role="main">
       <KBreadcrumbs :items="breadcrumbs" :ariaLabel="learnString('classesAndAssignmentsLabel')" />
       <h1 class="classroom-name">
         <KLabeledIcon icon="classes" :label="className" />
@@ -60,9 +61,10 @@
       const activeLessons = computed(() => getClassActiveLessons(get(classId)));
       const activeQuizzes = computed(() => getClassActiveQuizzes(get(classId)));
 
+      let pollTimeoutId;
+
       function schedulePoll() {
-        const timeoutId = setTimeout(pollForUpdates, 30000);
-        return timeoutId;
+        pollTimeoutId = setTimeout(pollForUpdates, 30000);
       }
 
       function pollForUpdates() {
@@ -71,10 +73,8 @@
         });
       }
 
-      let pollTimeoutId;
-
       onBeforeMount(() => {
-        pollTimeoutId = schedulePoll();
+        schedulePoll();
       });
 
       onBeforeUnmount(() => {
@@ -87,6 +87,12 @@
         activeQuizzes,
       };
     },
+    props: {
+      loading: {
+        type: Boolean,
+        default: false,
+      },
+    },
     computed: {
       breadcrumbs() {
         return [
diff --git a/kolibri/plugins/learn/assets/src/views/classes/LessonPlaylistPage.vue b/kolibri/plugins/learn/assets/src/views/classes/LessonPlaylistPage.vue
index 67f71ad27f6..9f9fd4de11f 100644
--- a/kolibri/plugins/learn/assets/src/views/classes/LessonPlaylistPage.vue
+++ b/kolibri/plugins/learn/assets/src/views/classes/LessonPlaylistPage.vue
@@ -26,7 +26,7 @@
             {{ currentLesson.description }}
           </p>
         </div>
-        <MissingResourceAlert v-if="lessonResources.length > contentNodes.length" />
+        <ResourceSyncingUiAlert v-if="lessonResources.length > contentNodes.length" />
       </section>
 
       <section v-if="lessonHasResources" class="content-cards">
@@ -43,6 +43,7 @@
         {{ $tr('noResourcesInLesson') }}
       </p>
     </div>
+    <KCircularLoader v-else />
   </LearnAppBarPage>
 
 </template>
@@ -56,7 +57,7 @@
   import ProgressIcon from 'kolibri.coreVue.components.ProgressIcon';
   import ContentIcon from 'kolibri.coreVue.components.ContentIcon';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
-  import MissingResourceAlert from 'kolibri-common/components/MissingResourceAlert';
+  import ResourceSyncingUiAlert from '../ResourceSyncingUiAlert';
   import useContentLink from '../../composables/useContentLink';
   import useContentNodeProgress from '../../composables/useContentNodeProgress';
   import { PageNames, ClassesPageNames } from '../../constants';
@@ -77,7 +78,7 @@
       ContentIcon,
       ProgressIcon,
       LearnAppBarPage,
-      MissingResourceAlert,
+      ResourceSyncingUiAlert,
     },
     mixins: [commonCoreStrings, commonLearnStrings, responsiveWindowMixin],
     setup() {
diff --git a/kolibri/plugins/learn/assets/test/views/explore-libraries-page.spec.js b/kolibri/plugins/learn/assets/test/views/explore-libraries-page.spec.js
index c3da021c9e0..099f1b03a6e 100644
--- a/kolibri/plugins/learn/assets/test/views/explore-libraries-page.spec.js
+++ b/kolibri/plugins/learn/assets/test/views/explore-libraries-page.spec.js
@@ -7,6 +7,7 @@ const localVue = createLocalVue();
 localVue.use(Vuex);
 localVue.use(VueRouter);
 
+jest.mock('../../src/composables/useCardLayoutSpan');
 jest.mock('../../src/composables/useChannels');
 jest.mock('../../src/composables/useDevices');
 jest.mock('../../src/composables/useContentLink');
diff --git a/kolibri/plugins/learn/assets/test/views/learning-activity-bar.spec.js b/kolibri/plugins/learn/assets/test/views/learning-activity-bar.spec.js
index 94c306d1383..fbe8a6fdd45 100644
--- a/kolibri/plugins/learn/assets/test/views/learning-activity-bar.spec.js
+++ b/kolibri/plugins/learn/assets/test/views/learning-activity-bar.spec.js
@@ -5,7 +5,9 @@ import LearningActivityBar from '../../src/views/LearningActivityBar';
 
 jest.mock('kolibri.coreVue.componentSets.sync');
 function makeWrapper({ propsData } = {}) {
-  return mount(LearningActivityBar, { propsData });
+  // stubbing out KCircularLoader, as using the actual component led to errors related to
+  // Vue Composition API - stub may not be needed once we upgrade to Vue 2.7
+  return mount(LearningActivityBar, { propsData, stubs: ['KCircularLoader'] });
 }
 
 describe('LearningActivityBar', () => {
@@ -293,7 +295,7 @@ describe('LearningActivityBar', () => {
 
       it(`doesn't show the downloading loader by default`, () => {
         const wrapper = makeWrapper();
-        expect(wrapper.find("[data-test='downloadingLoader'] svg").exists()).toBeFalsy();
+        expect(wrapper.find("[data-test='downloadingLoader']").vm.shouldShow).toBeFalsy();
       });
 
       it(`shows the downloading loader for truthy 'isDownloading'`, () => {
@@ -302,7 +304,7 @@ describe('LearningActivityBar', () => {
             isDownloading: true,
           },
         });
-        expect(wrapper.find("[data-test='downloadingLoader'] svg").exists()).toBeTruthy();
+        expect(wrapper.find("[data-test='downloadingLoader']").vm.shouldShow).toBeTruthy();
       });
     });
   });
diff --git a/kolibri/plugins/learn/assets/test/views/library-page.spec.js b/kolibri/plugins/learn/assets/test/views/library-page.spec.js
index 543aa7f07df..3beac038ef6 100644
--- a/kolibri/plugins/learn/assets/test/views/library-page.spec.js
+++ b/kolibri/plugins/learn/assets/test/views/library-page.spec.js
@@ -8,9 +8,12 @@ import { ContentNodeResource } from 'kolibri.resources';
 import useUser from 'kolibri.coreVue.composables.useUser';
 import { PageNames } from '../../src/constants';
 import LibraryPage from '../../src/views/LibraryPage';
+import OtherLibraries from '../../src/views/LibraryPage/OtherLibraries';
 /* eslint-disable import/named */
 import useSearch, { useSearchMock } from '../../src/composables/useSearch';
 import useChannels, { useChannelsMock } from '../../src/composables/useChannels';
+import usePinnedDevices, { usePinnedDevicesMock } from '../../src/composables/usePinnedDevices';
+import useDevices, { useDevicesMock } from '../../src/composables/useDevices';
 /* eslint-enable import/named */
 
 const localVue = createLocalVue();
@@ -34,6 +37,7 @@ const CHANNEL = {
 };
 
 jest.mock('../../src/composables/useChannels');
+jest.mock('../../src/composables/useCardLayoutSpan');
 jest.mock('../../src/composables/useDevices');
 jest.mock('../../src/composables/useSearch');
 jest.mock('../../src/composables/useLearnerResources');
@@ -215,86 +219,116 @@ describe('LibraryPage', () => {
       moreLibraries: 'More',
       pinned: 'Pinned',
     };
-    const options = {
-      methods: {
-        refreshDevices: jest.fn(),
-      },
-      $trs: translations,
-    };
+    async function makeOtherLibrariesWrapper({ options } = {}) {
+      const wrapper = shallowMount(OtherLibraries, {
+        localVue,
+        router,
+        ...options,
+        propsData: {
+          injectedtr: msgId => translations[msgId], // mock the translation function
+        },
+      });
+      await flushPromises();
+      return wrapper;
+    }
     beforeEach(() => {
       useUser.mockImplementation(() => ({ isUserLoggedIn: true }));
       useSearch.mockImplementation(() => useSearchMock({ displayingSearchResults: false }));
     });
 
     it('show other libraries', async () => {
-      wrapper = await makeWrapper({ options });
+      wrapper = await makeWrapper();
       expect(wrapper.find('[data-test="other-libraries"').element).toBeTruthy();
     });
 
     describe('Loading status', () => {
       it('display "searching" label', async () => {
-        wrapper = await makeWrapper({ options });
-        await wrapper.setData({ searching: true });
+        wrapper = await makeOtherLibrariesWrapper();
+        await wrapper.setData({ searchingOtherLibraries: true });
         expect(wrapper.find('[data-test="searching"').isVisible()).toBe(true);
         expect(wrapper.find('[data-test="searching-label"').text()).toEqual(
           translations.searchingOtherLibrary
         );
       });
       it('display "showing all" label', async () => {
-        wrapper = await makeWrapper({
+        wrapper = await makeOtherLibrariesWrapper({
           options: {
-            ...options,
             computed: {
               devicesWithChannelsExist: jest.fn(() => true),
             },
           },
         });
-        await wrapper.setData({ searching: false });
+        await wrapper.setData({ searchingOtherLibraries: false });
         expect(wrapper.find('[data-test="showing-all"').isVisible()).toBe(true);
         expect(wrapper.find('[data-test="showing-all-label"').text()).toEqual(
           translations.showingAllLibraries
         );
       });
       it('display "no other" label', async () => {
-        wrapper = await makeWrapper({
-          options: {
-            ...options,
-            computed: {
-              devicesWithChannelsExist: jest.fn(() => false),
-            },
-          },
-        });
-        await wrapper.setData({ searching: false });
+        wrapper = await makeOtherLibrariesWrapper();
+        await wrapper.setData({ searchingOtherLibraries: false });
         expect(wrapper.find('[data-test="no-other"').isVisible()).toBe(true);
         expect(wrapper.find('[data-test="no-other-label"').text()).toEqual(
           translations.noOtherLibraries
         );
       });
       it('display "pinned" label', async () => {
-        wrapper = await makeWrapper({
-          options: {
-            ...options,
-            computed: {
-              pinnedDevicesExist: jest.fn(() => true),
-              unpinnedDevicesExist: jest.fn(() => true),
+        usePinnedDevices.mockImplementation(() =>
+          usePinnedDevicesMock({
+            pinnedDevicesExist: jest.fn(() => true),
+            unpinnedDevicesExist: jest.fn(() => true),
+            pinnedDevices: [{ instance_id: '1' }],
+            unpinnedDevices: [{ instance_id: '2' }, { instance_id: '3' }, { instance_id: '4' }],
+          })
+        );
+        useDevices.mockImplementation(() =>
+          useDevicesMock({
+            deviceChannelsMap: {
+              '1': [CHANNEL],
+              '2': [CHANNEL],
+              '3': [CHANNEL],
+              '4': [CHANNEL],
             },
-          },
-        });
+            networkDevicesWithChannels: [
+              { instance_id: '1' },
+              { instance_id: '2' },
+              { instance_id: '3' },
+              { instance_id: '4' },
+            ],
+          })
+        );
+        wrapper = await makeOtherLibrariesWrapper();
         const pinnedLabel = wrapper.find('[data-test="pinned-label"');
         expect(pinnedLabel.element).toBeTruthy();
         expect(pinnedLabel.text()).toEqual(translations.pinned);
         expect(wrapper.find('[data-test="pinned-resources"').element).toBeTruthy();
       });
       it('display "more" label', async () => {
-        wrapper = await makeWrapper({
-          options: {
-            ...options,
-            computed: {
-              pinnedDevicesExist: jest.fn(() => true),
-              unpinnedDevicesExist: jest.fn(() => true),
+        usePinnedDevices.mockImplementation(() =>
+          usePinnedDevicesMock({
+            pinnedDevicesExist: jest.fn(() => true),
+            unpinnedDevicesExist: jest.fn(() => true),
+            pinnedDevices: [{ instance_id: '1' }],
+            unpinnedDevices: [{ instance_id: '2' }, { instance_id: '3' }, { instance_id: '4' }],
+          })
+        );
+        useDevices.mockImplementation(() =>
+          useDevicesMock({
+            deviceChannelsMap: {
+              '1': [CHANNEL],
+              '2': [CHANNEL],
+              '3': [CHANNEL],
+              '4': [CHANNEL],
             },
-          },
-        });
+            networkDevicesWithChannels: [
+              { instance_id: '1' },
+              { instance_id: '2' },
+              { instance_id: '3' },
+              { instance_id: '4' },
+            ],
+          })
+        );
+        wrapper = await makeOtherLibrariesWrapper();
         const moreLabel = wrapper.find('[data-test="more-label"');
         expect(moreLabel.element).toBeTruthy();
         expect(moreLabel.text()).toEqual(translations.moreLibraries);
diff --git a/kolibri/plugins/learn/assets/test/views/topic-content.spec.js b/kolibri/plugins/learn/assets/test/views/topic-content.spec.js
index 141ccb20c4f..ba8cb035e02 100644
--- a/kolibri/plugins/learn/assets/test/views/topic-content.spec.js
+++ b/kolibri/plugins/learn/assets/test/views/topic-content.spec.js
@@ -8,6 +8,7 @@ import useDownloadRequests, {
   useDownloadRequestsMock,
 } from '../../src/composables/useDownloadRequests';
 import useChannels, { useChannelsMock } from '../../src/composables/useChannels';
+import useCoreLearn, { useCoreLearnMock } from '../../src/composables/useCoreLearn';
 /* eslint-enable import/named */
 
 jest.mock('kolibri.urls');
@@ -15,6 +16,7 @@ jest.mock('kolibri.client');
 jest.mock('kolibri.resources');
 jest.mock('../../src/composables/useDownloadRequests');
 jest.mock('../../src/composables/useChannels');
+jest.mock('../../src/composables/useCoreLearn');
 jest.mock('../../src/composables/useDevices');
 
 const CONTENT_ID = 'content-id';
@@ -190,7 +192,12 @@ describe('TopicsContentPage', () => {
         beforeEach(async () => {
           useDownloadRequests.mockImplementation(() =>
             useDownloadRequestsMock({
-              isDownloadedByLearner: () => true,
+              downloadRequestMap: {
+                [CONTENT_ID]: {
+                  id: CONTENT_ID,
+                  status: 'COMPLETED',
+                },
+              },
             })
           );
           wrapper = await makeAuthWrapperWithRemoteContent();
@@ -210,7 +217,17 @@ describe('TopicsContentPage', () => {
         beforeEach(async () => {
           useDownloadRequests.mockImplementation(() =>
             useDownloadRequestsMock({
-              isDownloadingByLearner: () => true,
+              downloadRequestMap: {
+                [CONTENT_ID]: {
+                  id: CONTENT_ID,
+                  status: 'PENDING',
+                },
+              },
+            })
+          );
+          useCoreLearn.mockImplementation(() =>
+            useCoreLearnMock({
+              canAddDownloads: () => true,
             })
           );
           wrapper = await makeAuthWrapperWithRemoteContent();
@@ -246,7 +263,7 @@ describe('TopicsContentPage', () => {
           const addDownloadRequest = jest.fn();
           useDownloadRequests.mockImplementation(() =>
             useDownloadRequestsMock({
-              downloadRequestMap: { downloads: {} },
+              downloadRequestMap: {},
               addDownloadRequest,
             })
           );
diff --git a/kolibri/plugins/learn/kolibri_plugin.py b/kolibri/plugins/learn/kolibri_plugin.py
index 38f2227bfd3..041da845b05 100644
--- a/kolibri/plugins/learn/kolibri_plugin.py
+++ b/kolibri/plugins/learn/kolibri_plugin.py
@@ -172,3 +172,11 @@ def on_renew(self, instance, network_locations):
 @register_hook
 class MyDownloadsNavAction(NavigationHook):
     bundle_id = "my_downloads_side_nav"
+
+    @property
+    def plugin_data(self):
+        return {
+            "allowLearnerDownloads": get_device_setting(
+                "allow_learner_download_resources"
+            ),
+        }
diff --git a/kolibri/plugins/media_player/assets/src/utils/settings.js b/kolibri/plugins/media_player/assets/src/utils/settings.js
index 08b8b8db5d1..a33e7ac7e80 100755
--- a/kolibri/plugins/media_player/assets/src/utils/settings.js
+++ b/kolibri/plugins/media_player/assets/src/utils/settings.js
@@ -14,7 +14,7 @@ class Settings {
   }
 
   set playerMuted(playerMuted) {
-    return this.save({ playerMuted });
+    this.save({ playerMuted });
   }
 
   get playerMuted() {
@@ -22,7 +22,7 @@ class Settings {
   }
 
   set playerRate(playerRate) {
-    return this.save({ playerRate });
+    this.save({ playerRate });
   }
 
   get playerRate() {
@@ -30,7 +30,7 @@ class Settings {
   }
 
   set playerVolume(playerVolume) {
-    return this.save({ playerVolume });
+    this.save({ playerVolume });
   }
 
   get playerVolume() {
@@ -38,7 +38,7 @@ class Settings {
   }
 
   set captionLanguage(captionLanguage) {
-    return this.save({ captionLanguage });
+    this.save({ captionLanguage });
   }
 
   get captionLanguage() {
@@ -46,7 +46,7 @@ class Settings {
   }
 
   set captionSubtitles(captionSubtitles) {
-    return this.save({ captionSubtitles });
+    this.save({ captionSubtitles });
   }
 
   get captionSubtitles() {
@@ -54,7 +54,7 @@ class Settings {
   }
 
   set captionTranscript(captionTranscript) {
-    return this.save({ captionTranscript });
+    this.save({ captionTranscript });
   }
 
   get captionTranscript() {
@@ -62,7 +62,7 @@ class Settings {
   }
 
   set videoLangCode(videoLangCode) {
-    return this.save({ videoLangCode });
+    this.save({ videoLangCode });
   }
 
   get videoLangCode() {
diff --git a/kolibri/plugins/media_player/assets/src/views/MediaPlayerIndex.vue b/kolibri/plugins/media_player/assets/src/views/MediaPlayerIndex.vue
index 9f62773dc8d..919e423d4cd 100644
--- a/kolibri/plugins/media_player/assets/src/views/MediaPlayerIndex.vue
+++ b/kolibri/plugins/media_player/assets/src/views/MediaPlayerIndex.vue
@@ -89,7 +89,7 @@
   import { languageIdToCode } from 'kolibri.utils.i18n';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
   import responsiveElementMixin from 'kolibri.coreVue.mixins.responsiveElementMixin';
-  import responsiveWindowMixin from 'kolibri.coreVue.mixins.responsiveWindowMixin';
+  import useKResponsiveWindow from 'kolibri.coreVue.composables.useKResponsiveWindow';
   import Settings from '../utils/settings';
   import { ReplayButton, ForwardButton } from './customButtons';
   import MediaPlayerFullscreen from './MediaPlayerFullscreen';
@@ -113,7 +113,11 @@
   export default {
     name: 'MediaPlayerIndex',
     components: { MediaPlayerFullscreen, MediaPlayerTranscript },
-    mixins: [commonCoreStrings, responsiveWindowMixin, responsiveElementMixin],
+    mixins: [commonCoreStrings, responsiveElementMixin],
+    setup() {
+      const { windowIsSmall, windowIsPortrait } = useKResponsiveWindow();
+      return { windowIsSmall, windowIsPortrait };
+    },
     data: () => ({
       dummyTime: 0,
       progressStartingPoint: 0,
@@ -202,7 +206,6 @@
       defaultDuration() {
         return this.player.duration();
       },
-      /* eslint-enable kolibri/vue-no-unused-properties */
       transcriptWrap() {
         return this.windowIsPortrait || (!this.isFullscreen && this.windowIsSmall);
       },
@@ -652,6 +655,7 @@
   }
 
   .wrapper:not(.transcript-wrap) .media-player-transcript {
+    position: absolute;
     top: 0;
     width: 33.333%;
 
@@ -661,6 +665,7 @@
   }
 
   .wrapper.transcript-wrap .media-player-transcript {
+    position: relative;
     left: 0;
     height: #{$transcript-wrap-height};
 
diff --git a/kolibri/plugins/pdf_viewer/assets/src/views/PdfRendererIndex.vue b/kolibri/plugins/pdf_viewer/assets/src/views/PdfRendererIndex.vue
index 390d4e127ae..d4fcbe13fea 100644
--- a/kolibri/plugins/pdf_viewer/assets/src/views/PdfRendererIndex.vue
+++ b/kolibri/plugins/pdf_viewer/assets/src/views/PdfRendererIndex.vue
@@ -62,15 +62,17 @@
           </div>
         </div>
       </transition>
-      <KGrid gutter="0">
+      <KGrid class="full-height-container" gutter="0">
         <KGridItem
           v-if="showSideBar"
+          class="full-height-container"
           :layout8="{ span: 2 }"
           :layout12="{ span: 3 }"
-          class="sidebar-container"
-          :class="{ 'mt-40': showControls }"
         >
           <SideBar
+            id="sidebar-container"
+            class="scroller-height"
+            :style="{ position: 'sticky', top: 0 }"
             :outline="outline || []"
             :goToDestination="goToDestination"
             :focusDestPage="focusDestPage"
@@ -78,16 +80,17 @@
         </KGridItem>
         <KGridItem
           ref="pdfContainer"
+          class="full-height-container"
           :layout8="{ span: showSideBar ? 6 : 8 }"
           :layout12="{ span: showSideBar ? 9 : 12 }"
         >
           <RecycleList
+            id="pdf-container"
             ref="recycleList"
             :items="pdfPages"
             :itemHeight="itemHeight"
             :emitUpdate="true"
-            :style="{ height: `${elementHeight - 40}px` }"
-            class="pdf-container"
+            class="pdf-container scroller-height"
             keyField="index"
             @update="handleUpdate"
           >
@@ -124,7 +127,6 @@
   // polyfill necessary for recycle list
   import 'intersection-observer';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
-  import responsiveElementMixin from 'kolibri.coreVue.mixins.responsiveElementMixin';
   import responsiveWindowMixin from 'kolibri.coreVue.mixins.responsiveWindowMixin';
   import CoreFullscreen from 'kolibri.coreVue.components.CoreFullscreen';
   import '../utils/domPolyfills';
@@ -144,7 +146,7 @@
       RecycleList,
       CoreFullscreen,
     },
-    mixins: [responsiveWindowMixin, responsiveElementMixin, commonCoreStrings],
+    mixins: [responsiveWindowMixin, commonCoreStrings],
     data: () => ({
       progress: null,
       scale: null,
@@ -252,11 +254,6 @@
           });
         }
       },
-      elementHeight() {
-        if (this.recycleListIsMounted) {
-          this.debounceForceUpdateRecycleList();
-        }
-      },
       showSideBar() {
         this.$nextTick(() => {
           if (!this.$refs.pdfContainer || !this.$refs.pdfContainer.$el) {
@@ -271,15 +268,7 @@
       PDFJSLib.GlobalWorkerOptions.workerSrc =
         __webpack_public_path__ + `pdfJSWorker-${__version}.js`;
     },
-    destroyed() {
-      // Reset the overflow on the HTML tag that we set to hidden in created()
-      window.document.getElementsByTagName('html')[0].style.overflow = 'auto';
-    },
     created() {
-      // Override, only on this component, the overflow style of the HTML tag
-      // so that PDFRenderer can scroll itself.
-      window.document.getElementsByTagName('html')[0].style.overflow = 'hidden';
-
       this.worker = new PDFJSLib.PDFWorker();
 
       this.worker.promise.catch(error => {
@@ -315,7 +304,7 @@
             const viewPort = firstPage.getViewport({ scale: 1 });
             this.firstPageHeight = viewPort.height;
             this.firstPageWidth = viewPort.width;
-            this.scale = this.elementWidth / (this.firstPageWidth * this.screenSizeMultiplier);
+            this.scale = this.$el.clientWidth / (this.firstPageWidth * this.screenSizeMultiplier);
 
             // Set the firstPageToRender into the pdfPages object so that we do not refetch the page
             // from PDFJS when we do our initial render
@@ -328,6 +317,9 @@
             pdfDocument.getOutline().then(outline => {
               this.outline = outline;
               this.showSideBar = outline && outline.length > 0 && this.windowIsLarge; // Remove if other tabs are already implemented
+              // Reduce the scale slightly if we are showing the sidebar
+              // at first load.
+              this.scale = this.showSideBar ? 0.75 * this.scale : this.scale;
             });
           });
         })
@@ -473,11 +465,10 @@
       calculateRecycleListHeight() {
         return this.$refs.recycleList.$el.scrollHeight;
       },
-      debounceForceUpdateRecycleList: debounce(function() {
-        this.forceUpdateRecycleList();
-      }, renderDebounceTime),
       forceUpdateRecycleList() {
-        this.$refs.recycleList.updateVisibleItems(false);
+        if (this.$refs.recycleList) {
+          this.$refs.recycleList.updateVisibleItems(false);
+        }
       },
       updateProgress() {
         if (this.forceDurationBasedProgress) {
@@ -660,21 +651,22 @@
 
   @import '~kolibri-design-system/lib/styles/definitions';
   $controls-height: 40px;
-  $top-bar-height: 32px;
-  $tool-bar-height: 56px;
 
   .pdf-renderer {
     @extend %momentum-scroll;
     @extend %dropshadow-2dp;
 
     position: relative;
-    height: calc(100vh - #{$top-bar-height} - #{$controls-height} + 16px);
     overflow-y: hidden;
   }
 
   .pdf-container {
     position: relative;
-    top: $controls-height;
+    overflow-y: auto;
+  }
+
+  .scroller-height {
+    height: calc(100% - #{$controls-height});
   }
 
   .controls {
@@ -712,11 +704,6 @@
   }
 
   .fullscreen-header {
-    position: absolute;
-    top: 0;
-    right: 0;
-    left: 0;
-    z-index: 7;
     display: flex;
     height: $controls-height;
   }
@@ -738,27 +725,11 @@
     transform: translateY(-40px);
   }
 
-  .mt-40 {
-    margin-top: 40px;
-  }
-
-  .sidebar-container {
-    height: calc(100vh - #{$tool-bar-height});
-  }
-
-  .pdf-renderer.pdf-controls-open .sidebar-container {
-    height: calc(100vh - #{$tool-bar-height} - #{$controls-height});
-  }
-
-  .pdf-renderer.pdf-full-screen .sidebar-container {
-    height: 100vh;
-  }
-
-  .pdf-renderer.pdf-full-screen.pdf-controls-open .sidebar-container {
-    height: calc(100vh - #{$controls-height});
+  .full-height-container {
+    height: 100%;
   }
 
-  /deep/ .sidebar-container > div {
+  /deep/ .full-height-container > div {
     height: 100%;
   }
 
diff --git a/kolibri/plugins/pdf_viewer/assets/src/views/SideBar/index.vue b/kolibri/plugins/pdf_viewer/assets/src/views/SideBar/index.vue
index 3eb5c6cc91c..3e1f97fc59f 100644
--- a/kolibri/plugins/pdf_viewer/assets/src/views/SideBar/index.vue
+++ b/kolibri/plugins/pdf_viewer/assets/src/views/SideBar/index.vue
@@ -6,7 +6,7 @@
       background: $themeTokens.surface,
     }"
   >
-    <nav :style="{ height: '100%' }">
+    <nav>
       <div v-if="tabs.filter(t => !t.disabled).length > 1" :style="{ display: 'flex' }">
         <div
           v-for="tab in tabs"
@@ -144,10 +144,8 @@
 
 <style scoped lang="scss">
 
-  $sidebar-nav-height: 48px;
-
   .pdf-sidebar {
-    height: 100%;
+    overflow-y: auto;
     box-shadow: inset -1px 2px 8px rgba(0, 0, 0, 0.16);
   }
 
@@ -159,7 +157,6 @@
   }
 
   .sidebar-content {
-    height: calc(100% - #{$sidebar-nav-height});
     overflow-y: auto;
   }
 
diff --git a/kolibri/plugins/perseus_viewer/assets/src/views/PerseusRendererIndex.vue b/kolibri/plugins/perseus_viewer/assets/src/views/PerseusRendererIndex.vue
index 26888443030..a50fa8821ee 100644
--- a/kolibri/plugins/perseus_viewer/assets/src/views/PerseusRendererIndex.vue
+++ b/kolibri/plugins/perseus_viewer/assets/src/views/PerseusRendererIndex.vue
@@ -91,6 +91,7 @@
   import client from 'kolibri.client';
   import urls from 'kolibri.urls';
   import responsiveWindowMixin from 'kolibri.coreVue.mixins.responsiveWindowMixin';
+  import { isTouchDevice } from 'kolibri.utils.browserInfo';
   import scriptLoader from 'kolibri-common/utils/scriptLoader';
   import perseus from '../../dist/perseus';
   import icu from '../KAGlobals/icu';
@@ -142,11 +143,8 @@
       isMobile() {
         return this.windowBreakpoint < 3;
       },
-      // this is a nasty hack. Will find a better way
       usesTouch() {
-        // using mdn suggestion for most compatibility
-        const isMobileBrowser = new RegExp(/Mobi*|Android/);
-        return isMobileBrowser.test(window.navigator.userAgent);
+        return isTouchDevice;
       },
       itemRenderData() {
         return {
diff --git a/kolibri/plugins/pwa/templates/pwa/manifest.json b/kolibri/plugins/pwa/templates/pwa/manifest.json
index 8f5cdd0ec0b..50ca37dedc5 100644
--- a/kolibri/plugins/pwa/templates/pwa/manifest.json
+++ b/kolibri/plugins/pwa/templates/pwa/manifest.json
@@ -5,8 +5,8 @@
 {% get_current_language_bidi as LANGUAGE_BIDI %}
 {% get_current_language as LANGUAGE_CODE %}
 {
-  "name": "{% trans 'Kolibri'|escapejs %}",
-  "short_name": "{% trans 'Kolibri'|escapejs %}",
+  "name": "{% site_title|escapejs %}",
+  "short_name": "{% site_title|escapejs %}",
   "dir": "{{ LANGUAGE_BIDI|yesno:'rtl,ltr'|escapejs }}",
   "lang": "{{ LANGUAGE_CODE|escapejs }}",
   "icons": [
diff --git a/kolibri/plugins/setup_wizard/assets/src/machines/wizardMachine.js b/kolibri/plugins/setup_wizard/assets/src/machines/wizardMachine.js
index e3003a68e37..e6b52db6da5 100644
--- a/kolibri/plugins/setup_wizard/assets/src/machines/wizardMachine.js
+++ b/kolibri/plugins/setup_wizard/assets/src/machines/wizardMachine.js
@@ -239,23 +239,10 @@ export const wizardMachine = createMachine(
           BACK: 'requirePassword',
         },
       },
-      // A passthrough step depending on the value of context.canGetOsUser - the finalizeSetup state
-      // will provision the device with the OS user and create the default facility
-      createSuperuserAndFacility: {
-        on: { BACK: 'personalDataConsent' },
-        always: [
-          {
-            cond: 'canGetOsUser',
-            target: 'finalizeSetup',
-          },
-          {
-            target: 'createSuperuserAndFacilityForm',
-          },
-        ],
-      },
 
-      // If we're not able to get an OS user, the user creates their account
-      createSuperuserAndFacilityForm: {
+      // In the group learning flow we always create the account on the device
+      // and the backend associates it with the created superuser.
+      createSuperuserAndFacility: {
         meta: { route: { name: 'CREATE_SUPERUSER_AND_FACILITY', path: 'create-account' } },
         on: {
           CONTINUE: { target: 'finalizeSetup', actions: 'setSuperuser' },
diff --git a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/SettingUpKolibri.vue b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/SettingUpKolibri.vue
index d8dadc40edd..e26eca6e8e2 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/SettingUpKolibri.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/SettingUpKolibri.vue
@@ -120,9 +120,9 @@
       /** The data we will use to initialize the device during provisioning */
       deviceProvisioningData() {
         let superuser = null;
-        // We only need a superuser if we cannot get the OS user; null valued keys will be omitted
-        // in the eventual API call
-        if (!checkCapability('get_os_user')) {
+        // We need the superuser information unless the superuser will be created at login,
+        // based on the os user - this is only the case for on my own setup.
+        if (!(this.isOnMyOwnSetup && checkCapability('get_os_user'))) {
           // Here we see if we've set a firstImportedLodUser -- if they exist, they must be the
           // superuser as they were the first imported user.
           if (this.wizardContext('firstImportedLodUser')) {
@@ -154,7 +154,6 @@
             this.$tr('onMyOwnDeviceName', { name: get(superuser, 'full_name', '') }).slice(0, 50),
           allow_guest_access: Boolean(this.wizardContext('guestAccess')),
           is_provisioned: true,
-          os_user: checkCapability('get_os_user'),
           is_soud: this.wizardContext('fullOrLOD') === DeviceTypePresets.LOD,
         };
 
diff --git a/kolibri/plugins/user_auth/assets/src/views/SignInPage/index.vue b/kolibri/plugins/user_auth/assets/src/views/SignInPage/index.vue
index 27b81452b4d..0c3d19daf03 100644
--- a/kolibri/plugins/user_auth/assets/src/views/SignInPage/index.vue
+++ b/kolibri/plugins/user_auth/assets/src/views/SignInPage/index.vue
@@ -163,7 +163,6 @@
   import { validateUsername } from 'kolibri.utils.validators';
   import UiAutocompleteSuggestion from 'kolibri-design-system/lib/keen/UiAutocompleteSuggestion';
   import UiAlert from 'kolibri-design-system/lib/keen/UiAlert';
-  import responsiveWindowMixin from 'kolibri.coreVue.mixins.responsiveWindowMixin';
   import { ComponentMap } from '../../constants';
   import getUrlParameter from '../getUrlParameter';
   import AuthBase from '../AuthBase';
@@ -187,7 +186,7 @@
       UiAlert,
       UsersList,
     },
-    mixins: [responsiveWindowMixin, commonCoreStrings, commonUserStrings],
+    mixins: [commonCoreStrings, commonUserStrings],
     data() {
       return {
         username: '',
diff --git a/kolibri/plugins/user_profile/tasks.py b/kolibri/plugins/user_profile/tasks.py
index ba610ce5a57..1ec0efb573f 100644
--- a/kolibri/plugins/user_profile/tasks.py
+++ b/kolibri/plugins/user_profile/tasks.py
@@ -157,6 +157,16 @@ def mergeuser(command, **kwargs):
     job.save_meta()
     job.update_progress(1.0, 1.0)
 
+    try:
+        # If the local user is associated with an OSUser
+        # then transfer to the new remote user to maintain
+        # the association
+        os_user = local_user.os_user
+        os_user.user = remote_user
+        os_user.save()
+    except FacilityUser.os_user.RelatedObjectDoesNotExist:
+        pass
+
     # check if current user should be set as superuser:
     set_as_super_user = kwargs.get("set_as_super_user")
     if set_as_super_user and local_user.is_superuser:
diff --git a/kolibri/utils/android.py b/kolibri/utils/android.py
index 8aaddbdf167..e382b297803 100644
--- a/kolibri/utils/android.py
+++ b/kolibri/utils/android.py
@@ -1,4 +1,4 @@
-from os import environ
+import sys
 
 
 # A constant to be used in place of Python's platform.system()
@@ -8,7 +8,9 @@
 
 # Android is based on the Linux kernel, but due to security issues, we cannot
 # run the /proc command there, so we need a way to distinguish between the two.
-# Python for Android always sets some Android environment variables, so we check
-# for one of them to differentiate. This is how Kivy detects Android as well.
+# When Python is built against a specific version of the Android API, this method
+# is defined. Otherwise it is not. Note that this cannot be used to distinguish
+# between the current runtime versions of Android, as this value is set to the minimum
+# API level that this Python version was compiled against.
 def on_android():
-    return "ANDROID_ARGUMENT" in environ
+    return hasattr(sys, "getandroidapilevel")
diff --git a/kolibri/utils/file_transfer.py b/kolibri/utils/file_transfer.py
index fd8c2b3d674..12a2c1cd955 100644
--- a/kolibri/utils/file_transfer.py
+++ b/kolibri/utils/file_transfer.py
@@ -101,13 +101,89 @@ class ChunkedFileDoesNotExist(Exception):
     pass
 
 
+CHUNK_SUFFIX = ".chunks"
+
+
+class ChunkedFileDirectoryManager(object):
+    """
+    A class to manage all chunked files in a directory and all its descendant directories.
+    Its main purpose is to allow for the deletion of chunked files based on a least recently used
+    metric, as indicated by last access time on any of the files in the chunked file directory.
+    """
+
+    def __init__(self, chunked_file_dir):
+        self.chunked_file_dir = chunked_file_dir
+
+    def _get_chunked_file_dirs(self):
+        """
+        Returns a generator of all chunked file directories in the chunked file directory.
+        """
+        for root, dirs, _ in os.walk(self.chunked_file_dir):
+            for dir in dirs:
+                if dir.endswith(CHUNK_SUFFIX):
+                    yield os.path.join(root, dir)
+                    # Don't continue to walk down the directory tree
+                    dirs.remove(dir)
+
+    def _get_chunked_file_stats(self):
+        stats = {}
+        for chunked_file_dir in self._get_chunked_file_dirs():
+            file_stats = {"last_access_time": 0, "size": 0}
+            for dirpath, _, filenames in os.walk(chunked_file_dir):
+                for file in filenames:
+                    file_path = os.path.join(dirpath, file)
+                    file_stats["last_access_time"] = max(
+                        file_stats["last_access_time"], os.path.getatime(file_path)
+                    )
+                    file_stats["size"] += os.path.getsize(file_path)
+            stats[chunked_file_dir] = file_stats
+        return stats
+
+    def _do_file_eviction(self, chunked_file_stats, file_size):
+        chunked_file_dirs = sorted(
+            chunked_file_stats.keys(),
+            key=lambda x: chunked_file_stats[x]["last_access_time"],
+        )
+        evicted_file_size = 0
+        for chunked_file_dir in chunked_file_dirs:
+            # Do the check here to catch the edge case where file_size is <= 0
+            if file_size <= evicted_file_size:
+                break
+            file_stats = chunked_file_stats[chunked_file_dir]
+            evicted_file_size += file_stats["size"]
+            shutil.rmtree(chunked_file_dir)
+        return evicted_file_size
+
+    def evict_files(self, file_size):
+        """
+        Attempt to clean up file_size bytes of space in the chunked file directory.
+        Iterate through all chunked file directories, and delete the oldest chunked files
+        until the target file size is reached.
+        """
+        chunked_file_stats = self._get_chunked_file_stats()
+        return self._do_file_eviction(chunked_file_stats, file_size)
+
+    def limit_files(self, max_size):
+        """
+        Limits the total size used to a certain number of bytes.
+        If the total size of all chunked files exceeds max_size, the oldest files are evicted.
+        """
+        chunked_file_stats = self._get_chunked_file_stats()
+
+        total_size = sum(
+            file_stats["size"] for file_stats in chunked_file_stats.values()
+        )
+
+        return self._do_file_eviction(chunked_file_stats, total_size - max_size)
+
+
 class ChunkedFile(BufferedIOBase):
     # Set chunk size to 128KB
     chunk_size = 128 * 1024
 
     def __init__(self, filepath):
         self.filepath = filepath
-        self.chunk_dir = filepath + ".chunks"
+        self.chunk_dir = filepath + CHUNK_SUFFIX
         mkdirp(self.chunk_dir, exist_ok=True)
         self.cache_dir = os.path.join(self.chunk_dir, ".cache")
         self.position = 0
diff --git a/kolibri/utils/options.py b/kolibri/utils/options.py
index 2b906f1c708..8a3005e196c 100644
--- a/kolibri/utils/options.py
+++ b/kolibri/utils/options.py
@@ -404,6 +404,16 @@ def lazy_import_callback_list(value):
             "default": "",
             "description": "Eviction policy to use when using Redis for caching, Redis only.",
         },
+        "STREAMED_FILE_CACHE_SIZE": {
+            "type": "bytes",
+            "default": "500MB",
+            "description": """
+                Disk space to be used for caching streamed files. This is used for caching files that are
+                being streamed from remote libraries, if these files are later imported, these should be cleaned up,
+                and will no longer count to this cache size.
+                Value can either be a number suffixed with a unit (e.g. MB, GB, TB) or an integer number of bytes.
+            """,
+        },
     },
     "Database": {
         "DATABASE_ENGINE": {
diff --git a/kolibri/utils/server.py b/kolibri/utils/server.py
index dcc7b9b1139..cfaab345f7a 100644
--- a/kolibri/utils/server.py
+++ b/kolibri/utils/server.py
@@ -10,6 +10,7 @@
 from subprocess import CalledProcessError
 from subprocess import check_output
 
+import ifaddr
 import requests
 from cheroot.wsgi import Server as BaseServer
 from django.conf import settings
@@ -248,15 +249,11 @@ def START(self):
     START.priority = 75
 
 
-class ServicesPlugin(SimplePlugin):
-    def __init__(self, bus):
-        self.bus = bus
-        self.worker = None
-
+class DefaultScheduledTasksPlugin(SimplePlugin):
     def START(self):
-        from kolibri.core.tasks.main import initialize_workers
         from kolibri.core.analytics.tasks import schedule_ping
         from kolibri.core.deviceadmin.tasks import schedule_vacuum
+        from kolibri.core.deviceadmin.tasks import schedule_streamed_cache_cleanup
 
         # schedule the pingback job if not already scheduled
         schedule_ping()
@@ -264,6 +261,18 @@ def START(self):
         # schedule the vacuum job if not already scheduled
         schedule_vacuum()
 
+        # schedule the streamed cache cleanup job if not already scheduled
+        schedule_streamed_cache_cleanup()
+
+
+class ServicesPlugin(SimplePlugin):
+    def __init__(self, bus):
+        self.bus = bus
+        self.worker = None
+
+    def START(self):
+        from kolibri.core.tasks.main import initialize_workers
+
         # Initialize the iceqube engine to handle queued tasks
         self.worker = initialize_workers()
 
@@ -734,6 +743,9 @@ def __init__(
         reload_plugin = ProcessControlPlugin(self)
         reload_plugin.subscribe()
 
+        default_scheduled_tasks_plugin = DefaultScheduledTasksPlugin(self)
+        default_scheduled_tasks_plugin.subscribe()
+
     def run(self):
         self.graceful()
         self.block()
@@ -995,6 +1007,25 @@ def get_status():  # noqa: max-complexity=16
     # raise NotRunning(STATUS_UNKNOW)
 
 
+def _get_local_ips():
+    """
+    Don't rely on the zeroconf get_all_addresses here as it's possible that it could have been modified to only detect
+    interfaces that support multicasting. This is a fallback to get all the local IP addresses of the machine, whether they
+    are multicast or not.
+
+    However, we still exclude known dummy Windows 169.254.*.* addresses as these are not useful for the user to see.
+    :return: a list of IP addresses
+    """
+    return list(
+        set(
+            addr.ip
+            for iface in ifaddr.get_adapters()
+            for addr in iface.ips
+            if addr.is_IPv4 and not addr.ip.startswith("169.254")
+        )
+    )
+
+
 def get_urls(listen_port=None):
     """
     :param listen_port: if set, will not try to determine the listen port from
@@ -1009,7 +1040,7 @@ def get_urls(listen_port=None):
         if port:
             try:
                 all_addresses = (
-                    get_all_addresses()
+                    _get_local_ips()
                     if conf.OPTIONS["Deployment"]["LISTEN_ADDRESS"] == "0.0.0.0"
                     else [conf.OPTIONS["Deployment"]["LISTEN_ADDRESS"]]
                 )
diff --git a/kolibri/utils/tests/test_chunked_file.py b/kolibri/utils/tests/test_chunked_file.py
index c130d229028..3a900b05277 100644
--- a/kolibri/utils/tests/test_chunked_file.py
+++ b/kolibri/utils/tests/test_chunked_file.py
@@ -2,40 +2,50 @@
 import math
 import os
 import shutil
+import tempfile
 import unittest
 
+from kolibri.utils.file_transfer import CHUNK_SUFFIX
 from kolibri.utils.file_transfer import ChunkedFile
+from kolibri.utils.file_transfer import ChunkedFileDirectoryManager
 from kolibri.utils.file_transfer import ChunkedFileDoesNotExist
 
 
+def _write_test_data_to_chunked_file(chunked_file):
+    data = b""
+    for i in range(chunked_file.chunks_count):
+        with open(
+            os.path.join(chunked_file.chunk_dir, ".chunk_{}".format(i)), "wb"
+        ) as f:
+            size = (
+                chunked_file.chunk_size
+                if i < chunked_file.chunks_count - 1
+                else (chunked_file.file_size % chunked_file.chunk_size)
+            )
+            to_write = os.urandom(size)
+            f.write(to_write)
+            data += to_write
+    return data
+
+
+TEST_FILE_SIZE = (1024 * 1024) + 731
+
+
 class TestChunkedFile(unittest.TestCase):
     def setUp(self):
         self.file_path = "test_file"
 
         self.chunk_size = ChunkedFile.chunk_size
-        self.file_size = (1024 * 1024) + 731
+        self.file_size = TEST_FILE_SIZE
 
         self.chunked_file = ChunkedFile(self.file_path)
+        self.chunked_file.file_size = self.file_size
 
         # Create dummy chunks
         self.chunks_count = int(
             math.ceil(float(self.file_size) / float(self.chunk_size))
         )
-        self.data = b""
-        for i in range(self.chunks_count):
-            with open(
-                os.path.join(self.chunked_file.chunk_dir, ".chunk_{}".format(i)), "wb"
-            ) as f:
-                size = (
-                    self.chunk_size
-                    if i < self.chunks_count - 1
-                    else (self.file_size % self.chunk_size)
-                )
-                to_write = os.urandom(size)
-                f.write(to_write)
-                self.data += to_write
-
-        self.chunked_file.file_size = self.file_size
+        self.data = _write_test_data_to_chunked_file(self.chunked_file)
 
     def tearDown(self):
         shutil.rmtree(self.chunked_file.chunk_dir, ignore_errors=True)
@@ -287,3 +297,230 @@ def test_file_finalized_by_parallel_process_after_opening_locking(self):
         with self.assertRaises(ChunkedFileDoesNotExist):
             with self.chunked_file.lock_chunks(0):
                 pass
+
+
+# The expected number of bytes taken up by files used in the diskcache
+# for chunked files.
+EXPECTED_DISKCACHE_SIZE = 32768
+
+
+TOTAL_CHUNKED_FILE_SIZE = TEST_FILE_SIZE + EXPECTED_DISKCACHE_SIZE
+
+
+class TestChunkedFileDirectoryManager(unittest.TestCase):
+    def setUp(self):
+        self.base_dir = tempfile.mkdtemp()
+        for files in [
+            ["file1.txt"],
+            ["nested_once", "file2.txt"],
+            ["nested", "nested_twice", "file3.txt"],
+        ]:
+            file_path = os.path.join(self.base_dir, *files)
+            chunked_file = ChunkedFile(file_path)
+            chunked_file.file_size = TEST_FILE_SIZE
+            _write_test_data_to_chunked_file(chunked_file)
+
+    def tearDown(self):
+        shutil.rmtree(self.base_dir, ignore_errors=True)
+
+    def test_listing_chunked_files(self):
+        manager = ChunkedFileDirectoryManager(self.base_dir)
+        self.assertEqual(
+            sorted(list(manager._get_chunked_file_dirs())),
+            sorted(
+                [
+                    os.path.join(self.base_dir, "file1.txt" + CHUNK_SUFFIX),
+                    os.path.join(
+                        self.base_dir, "nested_once", "file2.txt" + CHUNK_SUFFIX
+                    ),
+                    os.path.join(
+                        self.base_dir,
+                        "nested",
+                        "nested_twice",
+                        "file3.txt" + CHUNK_SUFFIX,
+                    ),
+                ]
+            ),
+        )
+
+    def test_get_chunked_file_stats(self):
+        manager = ChunkedFileDirectoryManager(self.base_dir)
+        stats = manager._get_chunked_file_stats()
+
+        for file_path, file_stats in stats.items():
+            self.assertEqual(file_stats["size"], TOTAL_CHUNKED_FILE_SIZE)
+            expected_last_access_time = 0
+            for dirpath, _, filenames in os.walk(file_path):
+                for filename in filenames:
+                    expected_last_access_time = max(
+                        expected_last_access_time,
+                        os.path.getatime(os.path.join(dirpath, filename)),
+                    )
+            self.assertEqual(file_stats["last_access_time"], expected_last_access_time)
+
+    def test_evict_files_exact_file_size_sum(self):
+        manager = ChunkedFileDirectoryManager(self.base_dir)
+        self.assertEqual(
+            TOTAL_CHUNKED_FILE_SIZE * 3,
+            manager.evict_files(TOTAL_CHUNKED_FILE_SIZE * 3),
+        )
+        self.assertEqual(
+            sorted(list(manager._get_chunked_file_dirs())),
+            sorted([]),
+        )
+
+    def test_evict_files_more_than_file_size_sum(self):
+        manager = ChunkedFileDirectoryManager(self.base_dir)
+        self.assertEqual(
+            TOTAL_CHUNKED_FILE_SIZE * 3,
+            manager.evict_files(TOTAL_CHUNKED_FILE_SIZE * 3 + 12),
+        )
+        self.assertEqual(
+            sorted(list(manager._get_chunked_file_dirs())),
+            sorted([]),
+        )
+
+    def test_evict_files_exact_file_size(self):
+        manager = ChunkedFileDirectoryManager(self.base_dir)
+        self.assertEqual(
+            TOTAL_CHUNKED_FILE_SIZE, manager.evict_files(TOTAL_CHUNKED_FILE_SIZE)
+        )
+        self.assertEqual(
+            sorted(list(manager._get_chunked_file_dirs())),
+            sorted(
+                [
+                    os.path.join(
+                        self.base_dir, "nested_once", "file2.txt" + CHUNK_SUFFIX
+                    ),
+                    os.path.join(
+                        self.base_dir,
+                        "nested",
+                        "nested_twice",
+                        "file3.txt" + CHUNK_SUFFIX,
+                    ),
+                ]
+            ),
+        )
+
+    def test_evict_files_less_than_file_size(self):
+        manager = ChunkedFileDirectoryManager(self.base_dir)
+        self.assertEqual(
+            TOTAL_CHUNKED_FILE_SIZE, manager.evict_files(TOTAL_CHUNKED_FILE_SIZE - 12)
+        )
+        self.assertEqual(
+            sorted(list(manager._get_chunked_file_dirs())),
+            sorted(
+                [
+                    os.path.join(
+                        self.base_dir, "nested_once", "file2.txt" + CHUNK_SUFFIX
+                    ),
+                    os.path.join(
+                        self.base_dir,
+                        "nested",
+                        "nested_twice",
+                        "file3.txt" + CHUNK_SUFFIX,
+                    ),
+                ]
+            ),
+        )
+
+    def test_evict_files_more_than_file_size(self):
+        manager = ChunkedFileDirectoryManager(self.base_dir)
+        self.assertEqual(
+            TOTAL_CHUNKED_FILE_SIZE * 2,
+            manager.evict_files(TOTAL_CHUNKED_FILE_SIZE + 12),
+        )
+        self.assertEqual(
+            sorted(list(manager._get_chunked_file_dirs())),
+            sorted(
+                [
+                    os.path.join(
+                        self.base_dir,
+                        "nested",
+                        "nested_twice",
+                        "file3.txt" + CHUNK_SUFFIX,
+                    ),
+                ]
+            ),
+        )
+
+    def test_evict_files_more_than_twice_file_size(self):
+        manager = ChunkedFileDirectoryManager(self.base_dir)
+        self.assertEqual(
+            TOTAL_CHUNKED_FILE_SIZE * 3,
+            manager.evict_files(TOTAL_CHUNKED_FILE_SIZE * 2 + 12),
+        )
+        self.assertEqual(
+            sorted(list(manager._get_chunked_file_dirs())),
+            sorted([]),
+        )
+
+    def test_evict_files_zero_bytes(self):
+        manager = ChunkedFileDirectoryManager(self.base_dir)
+        self.assertEqual(0, manager.evict_files(0))
+        self.assertEqual(
+            sorted(list(manager._get_chunked_file_dirs())),
+            sorted(
+                [
+                    os.path.join(self.base_dir, "file1.txt" + CHUNK_SUFFIX),
+                    os.path.join(
+                        self.base_dir, "nested_once", "file2.txt" + CHUNK_SUFFIX
+                    ),
+                    os.path.join(
+                        self.base_dir,
+                        "nested",
+                        "nested_twice",
+                        "file3.txt" + CHUNK_SUFFIX,
+                    ),
+                ]
+            ),
+        )
+
+    def test_limit_files_no_eviction_needed(self):
+        manager = ChunkedFileDirectoryManager(self.base_dir)
+        manager.limit_files(TOTAL_CHUNKED_FILE_SIZE * 3)
+        self.assertEqual(
+            sorted(list(manager._get_chunked_file_dirs())),
+            sorted(
+                [
+                    os.path.join(self.base_dir, "file1.txt" + CHUNK_SUFFIX),
+                    os.path.join(
+                        self.base_dir, "nested_once", "file2.txt" + CHUNK_SUFFIX
+                    ),
+                    os.path.join(
+                        self.base_dir,
+                        "nested",
+                        "nested_twice",
+                        "file3.txt" + CHUNK_SUFFIX,
+                    ),
+                ]
+            ),
+        )
+
+    def test_limit_files_some_eviction_needed(self):
+        manager = ChunkedFileDirectoryManager(self.base_dir)
+        manager.limit_files(TOTAL_CHUNKED_FILE_SIZE * 2)
+        self.assertEqual(
+            sorted(list(manager._get_chunked_file_dirs())),
+            sorted(
+                [
+                    os.path.join(
+                        self.base_dir, "nested_once", "file2.txt" + CHUNK_SUFFIX
+                    ),
+                    os.path.join(
+                        self.base_dir,
+                        "nested",
+                        "nested_twice",
+                        "file3.txt" + CHUNK_SUFFIX,
+                    ),
+                ]
+            ),
+        )
+
+    def test_limit_files_all_evicted(self):
+        manager = ChunkedFileDirectoryManager(self.base_dir)
+        manager.limit_files(TOTAL_CHUNKED_FILE_SIZE - 12)
+        self.assertEqual(
+            sorted(list(manager._get_chunked_file_dirs())),
+            sorted([]),
+        )
diff --git a/kolibri/utils/tests/test_server.py b/kolibri/utils/tests/test_server.py
index d327512f1ef..e9b88dc32fe 100755
--- a/kolibri/utils/tests/test_server.py
+++ b/kolibri/utils/tests/test_server.py
@@ -113,12 +113,30 @@ def test_required_services_initiate_on_start(
 
         mock_kolibri_broadcast.assert_not_called()
 
-    @mock.patch("kolibri.core.tasks.main.initialize_workers")
+    def test_services_shutdown_on_stop(self):
+
+        # Initialize and ready services plugin for testing
+        services_plugin = server.ServicesPlugin(mock.MagicMock(name="bus"))
+
+        from kolibri.core.tasks.worker import Worker
+
+        services_plugin.worker = mock.MagicMock(name="worker", spec_set=Worker)
+
+        # Now, let us stop services plugin
+        services_plugin.STOP()
+
+        # Do we shutdown workers correctly?
+        assert services_plugin.worker.shutdown.call_count == 1
+        assert services_plugin.worker.mock_calls == [
+            mock.call.shutdown(wait=True),
+        ]
+
+
+class TestServerDefaultScheduledTasks(object):
     @mock.patch("kolibri.core.discovery.utils.network.broadcast.KolibriBroadcast")
     def test_scheduled_jobs_persist_on_restart(
         self,
         mock_kolibri_broadcast,
-        initialize_workers,
         job_storage,
     ):
         with mock.patch("kolibri.core.tasks.registry.job_storage", wraps=job_storage):
@@ -132,48 +150,34 @@ def test_scheduled_jobs_persist_on_restart(
             test2 = job_storage.schedule(schedule_time, Job(id))
 
             # Now, start services plugin
-            service_plugin = server.ServicesPlugin(mock.MagicMock(name="bus"))
-            service_plugin.START()
+            default_scheduled_tasks_plugin = server.DefaultScheduledTasksPlugin(
+                mock.MagicMock(name="bus")
+            )
+            default_scheduled_tasks_plugin.START()
 
             # Currently, we must have exactly four scheduled jobs
             # two userdefined and two server defined (pingback and vacuum)
             from kolibri.core.analytics.tasks import DEFAULT_PING_JOB_ID
             from kolibri.core.deviceadmin.tasks import SCH_VACUUM_JOB_ID
+            from kolibri.core.deviceadmin.tasks import STREAMED_CACHE_CLEANUP_JOB_ID
 
-            assert len(job_storage) == 4
+            assert len(job_storage) == 5
             assert job_storage.get_job(test1) is not None
             assert job_storage.get_job(test2) is not None
             assert job_storage.get_job(DEFAULT_PING_JOB_ID) is not None
             assert job_storage.get_job(SCH_VACUUM_JOB_ID) is not None
+            assert job_storage.get_job(STREAMED_CACHE_CLEANUP_JOB_ID) is not None
 
             # Restart services
-            service_plugin.STOP()
-            service_plugin.START()
+            default_scheduled_tasks_plugin.START()
 
             # Make sure all scheduled jobs persist after restart
-            assert len(job_storage) == 4
+            assert len(job_storage) == 5
             assert job_storage.get_job(test1) is not None
             assert job_storage.get_job(test2) is not None
             assert job_storage.get_job(DEFAULT_PING_JOB_ID) is not None
             assert job_storage.get_job(SCH_VACUUM_JOB_ID) is not None
-
-    def test_services_shutdown_on_stop(self):
-
-        # Initialize and ready services plugin for testing
-        services_plugin = server.ServicesPlugin(mock.MagicMock(name="bus"))
-
-        from kolibri.core.tasks.worker import Worker
-
-        services_plugin.worker = mock.MagicMock(name="worker", spec_set=Worker)
-
-        # Now, let us stop services plugin
-        services_plugin.STOP()
-
-        # Do we shutdown workers correctly?
-        assert services_plugin.worker.shutdown.call_count == 1
-        assert services_plugin.worker.mock_calls == [
-            mock.call.shutdown(wait=True),
-        ]
+            assert job_storage.get_job(STREAMED_CACHE_CLEANUP_JOB_ID) is not None
 
 
 class TestZeroConfPlugin(object):
diff --git a/package.json b/package.json
index cba04b5f89f..6de1acd91f4 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
   },
   "private": true,
   "devDependencies": {
-    "@types/jest": "^29.5.5",
+    "@types/jest": "^29.5.6",
     "xhr-mock": "^2.5.1",
     "concurrently": "^8.0.1"
   },
diff --git a/packages/browserslist-config-kolibri/package.json b/packages/browserslist-config-kolibri/package.json
index f0dde81ad18..27d757cd813 100644
--- a/packages/browserslist-config-kolibri/package.json
+++ b/packages/browserslist-config-kolibri/package.json
@@ -1,6 +1,6 @@
 {
   "name": "browserslist-config-kolibri",
-  "version": "0.16.0-dev.4",
+  "version": "0.16.0-dev.5",
   "description": "Browsers list configuration for Kolibri",
   "main": "index.js",
   "repository": "github.com/learningequality/kolibri",
diff --git a/packages/eslint-plugin-kolibri/package.json b/packages/eslint-plugin-kolibri/package.json
index f9609bbbbb1..19dad8ef54c 100644
--- a/packages/eslint-plugin-kolibri/package.json
+++ b/packages/eslint-plugin-kolibri/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-kolibri",
-  "version": "0.16.0-dev.4",
+  "version": "0.16.0-dev.5",
   "description": "Custom rules.",
   "author": "Learning Equality",
   "main": "lib/index.js",
diff --git a/packages/hashi/package.json b/packages/hashi/package.json
index aa4f02f571f..e8087be3124 100644
--- a/packages/hashi/package.json
+++ b/packages/hashi/package.json
@@ -22,7 +22,7 @@
     "purgecss": "^5.0.0"
   },
   "dependencies": {
-    "core-js": "3.32",
+    "core-js": "3.33",
     "dayjs": "^1.11.10",
     "fflate": "^0.8.1",
     "iri": "^1.3.1",
diff --git a/packages/kolibri-common/components/MissingResourceAlert.vue b/packages/kolibri-common/components/MissingResourceAlert.vue
index d826540f64f..488865d6aa1 100644
--- a/packages/kolibri-common/components/MissingResourceAlert.vue
+++ b/packages/kolibri-common/components/MissingResourceAlert.vue
@@ -7,16 +7,21 @@
       type="warning"
       :style="{ marginBottom: 0, marginTop: '8px' }"
     >
-      <span>
-        {{ coreString(
-          multiple ? 'someResourcesMissingOrNotSupported' :
-          'resourceNotFoundOnDevice'
-        ) }}
+      <span v-if="$slots.syncAlert">
+        <slot name="syncAlert"></slot>
+      </span>
+      <span v-else>
+        <span>
+          {{ coreString(
+            multiple ? 'someResourcesMissingOrNotSupported' :
+            'resourceNotFoundOnDevice'
+          ) }}
+        &nbsp;
+          <KButton appearance="basic-link" @click="open = true">
+            {{ $tr('learnMore') }}
+          </KButton>
+        </span>
       </span>
-              &nbsp;
-      <KButton appearance="basic-link" @click="open = true">
-        {{ $tr('learnMore') }}
-      </KButton>
     </UiAlert>
     <KModal
       v-if="open"
diff --git a/packages/kolibri-core-for-export/package.json b/packages/kolibri-core-for-export/package.json
index 9bf6cac891c..7ff72a04235 100644
--- a/packages/kolibri-core-for-export/package.json
+++ b/packages/kolibri-core-for-export/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kolibri",
-  "version": "0.16.0-dev.4",
+  "version": "0.16.0-dev.5",
   "description": "The Kolibri core API",
   "repository": "github.com/learningequality/kolibri",
   "author": "Learning Equality",
@@ -12,7 +12,7 @@
     "@vueuse/core": "^9.13.0",
     "axios": "^1.5.1",
     "clipboard": "^2.0.11",
-    "core-js": "^3.32",
+    "core-js": "^3.33",
     "csv-generator-client": "^2.1.1",
     "date-fns": "^1.28.2",
     "deep-object-diff": "^1.1.9",
@@ -24,7 +24,7 @@
     "js-cookie": "^3.0.5",
     "knuth-shuffle-seeded": "^1.0.6",
     "kolibri-constants": "0.2.0",
-    "kolibri-design-system": "https://github.com/learningequality/kolibri-design-system#3ab9801a442b20ddf63248b17ca0d83fe21133fb",
+    "kolibri-design-system": "https://github.com/learningequality/kolibri-design-system#ab03c5e257a7806c67cf6250310e3e6ccb5119c9",
     "lockr": "0.8.5",
     "lodash": "^4.17.21",
     "loglevel": "^1.8.1",
diff --git a/packages/kolibri-tools/lib/cli.js b/packages/kolibri-tools/lib/cli.js
index f0509710149..2c336694d8f 100755
--- a/packages/kolibri-tools/lib/cli.js
+++ b/packages/kolibri-tools/lib/cli.js
@@ -513,7 +513,7 @@ function _generatePathInfo({
       })
     );
   }
-  if (namespace && searchPath) {
+  if (namespace.length && namespace.length == searchPath.length) {
     let aliases;
     if (webpackConfig) {
       const webpack = require('webpack');
@@ -528,19 +528,25 @@ function _generatePathInfo({
       }
       aliases = buildConfig.resolve.alias;
     }
-    pathInfoArray.push({
-      moduleFilePath: searchPath,
-      namespace: namespace,
-      name: namespace,
-      aliases,
-    });
+    for (let i = 0; i < namespace.length; i++) {
+      pathInfoArray.push({
+        moduleFilePath: searchPath[i],
+        namespace: namespace[i],
+        name: namespace[i],
+        aliases,
+      });
+    }
   }
   if (pathInfoArray.length) {
     return pathInfoArray;
   }
   cliLogging.error('This command requires one or more of the following combinations of arguments:');
   cliLogging.error('1) The --pluginFile, --plugins, or --pluginPath argument.');
-  cliLogging.error('2) The --searchPath argument along with the --namespace argument.');
+  cliLogging.error('2) One or more pairs of the --searchPath and --namespace arguments.');
+}
+
+function _collect(value, previous) {
+  return previous.concat([value]);
 }
 
 function _addPathOptions(cmd) {
@@ -564,7 +570,12 @@ function _addPathOptions(cmd) {
       list,
       langIgnoreDefaults.length ? langIgnoreDefaults : ignoreDefaults
     )
-    .option('-n , --namespace <namespace>', 'Set namespace for string extraction')
+    .option(
+      '-n , --namespace <namespace>',
+      'Set namespace for string extraction; this may be specified multiple times, but there must be an equal number of --searchPath arguments',
+      _collect,
+      []
+    )
     .option(
       '--localeDataFolder <localeDataFolder>',
       'Set path to write locale files to',
@@ -573,7 +584,9 @@ function _addPathOptions(cmd) {
     )
     .option(
       '--searchPath <searchPath>',
-      'Set path to search for files containing strings to be extracted'
+      'Set path to search for files containing strings to be extracted; this may be specified multiple times, but there must be an equal number of --namespace arguments',
+      _collect,
+      []
     )
     .option(
       '--webpackConfig <webpackConfig>',
diff --git a/packages/kolibri-tools/package.json b/packages/kolibri-tools/package.json
index 1c65ed13e2d..51a876c8703 100644
--- a/packages/kolibri-tools/package.json
+++ b/packages/kolibri-tools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kolibri-tools",
-  "version": "0.16.0-dev.4",
+  "version": "0.16.0-dev.5",
   "description": "Tools for building Kolibri frontend plugins",
   "main": "lib/cli.js",
   "repository": "github.com/learningequality/kolibri",
@@ -14,36 +14,36 @@
     "build-kolibri-tools": "node ./build_kolibri_tools.js"
   },
   "dependencies": {
-    "@babel/core": "^7.23.0",
+    "@babel/core": "^7.23.2",
     "@babel/plugin-syntax-import-assertions": "^7.22.5",
-    "@babel/plugin-transform-runtime": "^7.22.15",
-    "@babel/preset-env": "^7.22.20",
-    "@testing-library/jest-dom": "^6.1.3",
+    "@babel/plugin-transform-runtime": "^7.23.2",
+    "@babel/preset-env": "^7.23.2",
+    "@testing-library/jest-dom": "^6.1.4",
     "@vue/test-utils": "^1.3.6",
     "ast-traverse": "^0.1.1",
     "autoprefixer": "10.4.16",
     "babel-core": "7.0.0-bridge.0",
     "babel-jest": "^29.7.0",
     "babel-loader": "^9.1.3",
-    "browserslist-config-kolibri": "0.16.0-dev.4",
+    "browserslist-config-kolibri": "0.16.0-dev.5",
     "chalk": "4.1.2",
     "check-node-version": "^4.2.1",
     "chokidar": "^3.5.3",
     "cli-table": "^0.3.11",
-    "commander": "^11.0.0",
+    "commander": "^11.1.0",
     "core-js": "^3",
     "css-loader": "6.8.1",
     "css-minimizer-webpack-plugin": "5.0.1",
-    "csv-parse": "^5.5.0",
+    "csv-parse": "^5.5.2",
     "csv-writer": "^1.3.0",
     "del": "^6.1.1",
     "escodegen": "^2.1.0",
     "eslint": "^6.8.0",
     "eslint-config-prettier": "^6.15.0",
     "eslint-config-vue": "^2.0.2",
-    "eslint-plugin-import": "^2.28.1",
+    "eslint-plugin-import": "^2.29.0",
     "eslint-plugin-jest": "^23.3.0",
-    "eslint-plugin-kolibri": "0.16.0-dev.4",
+    "eslint-plugin-kolibri": "0.16.0-dev.5",
     "eslint-plugin-vue": "^7.3.0",
     "espree": "9.6.1",
     "esquery": "^1.5.0",
@@ -54,7 +54,7 @@
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "jest-serializer-vue": "^3.1.0",
-    "launch-editor-middleware": "^2.5.0",
+    "launch-editor-middleware": "^2.6.1",
     "lodash": "^4.17.21",
     "mini-css-extract-plugin": "^2.7.6",
     "node-sass": "9.0.0",
@@ -86,13 +86,13 @@
     "toml": "^3.0.0",
     "url-loader": "^4.1.1",
     "vue-jest": "^3.0.0",
-    "vue-loader": "^15.10.2",
+    "vue-loader": "^15.11.1",
     "vue-style-loader": "^4.1.3",
     "vue-template-compiler": "^2.6.11",
-    "webpack": "^5.88.2",
+    "webpack": "^5.89.0",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^4.15.1",
-    "webpack-merge": "^5.9.0"
+    "webpack-merge": "^5.10.0"
   },
   "engines": {
     "node": "16.x",
@@ -101,4 +101,4 @@
   "devDependencies": {
     "rewire": "^6.0.0"
   }
-}
+}
\ No newline at end of file
diff --git a/requirements/base.txt b/requirements/base.txt
index f637f9784e2..e796ce080fb 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -13,10 +13,10 @@ cheroot==8.6.0
 magicbus==4.1.2
 futures==3.1.1  # Temporarily pinning this until we can do a Python 2/3 compatible solution of newer versions # pyup: <=3.1.1
 more-itertools==5.0.0  # Last Python 2.7 friendly release # pyup: <6.0
-le-utils==0.2.1
+le-utils==0.2.2
 jsonfield==2.0.2
 requests-toolbelt==0.9.1
-morango==0.6.16
+morango==0.6.18
 tzlocal==2.1
 pytz==2022.1
 python-dateutil==2.8.2
diff --git a/yarn.lock b/yarn.lock
index bfb81851ee3..e8322941b90 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,7 +2,7 @@
 # yarn lockfile v1
 
 
-"@adobe/css-tools@^4.3.0":
+"@adobe/css-tools@^4.3.1":
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.3.1.tgz#abfccb8ca78075a2b6187345c26243c1a0842f28"
   integrity sha512-/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg==
@@ -30,25 +30,25 @@
     "@babel/highlight" "^7.22.13"
     chalk "^2.4.2"
 
-"@babel/compat-data@^7.22.20", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.20.tgz#8df6e96661209623f1975d66c35ffca66f3306d0"
-  integrity sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw==
+"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9", "@babel/compat-data@^7.23.2":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.2.tgz#6a12ced93455827037bfb5ed8492820d60fc32cc"
+  integrity sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ==
 
-"@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.0.tgz#f8259ae0e52a123eb40f552551e647b506a94d83"
-  integrity sha512-97z/ju/Jy1rZmDxybphrBuI+jtJjFVoz7Mr9yUQVVVi+DNZE333uFQeMOqcCIy1x3WYBIbWftUSLmbNXNT7qFQ==
+"@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.23.2":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.2.tgz#ed10df0d580fff67c5f3ee70fd22e2e4c90a9f94"
+  integrity sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
     "@babel/code-frame" "^7.22.13"
     "@babel/generator" "^7.23.0"
     "@babel/helper-compilation-targets" "^7.22.15"
     "@babel/helper-module-transforms" "^7.23.0"
-    "@babel/helpers" "^7.23.0"
+    "@babel/helpers" "^7.23.2"
     "@babel/parser" "^7.23.0"
     "@babel/template" "^7.22.15"
-    "@babel/traverse" "^7.23.0"
+    "@babel/traverse" "^7.23.2"
     "@babel/types" "^7.23.0"
     convert-source-map "^2.0.0"
     debug "^4.1.0"
@@ -145,10 +145,10 @@
     regexpu-core "^5.3.1"
     semver "^6.3.0"
 
-"@babel/helper-define-polyfill-provider@^0.4.2":
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz#82c825cadeeeee7aad237618ebbe8fa1710015d7"
-  integrity sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==
+"@babel/helper-define-polyfill-provider@^0.4.3":
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.3.tgz#a71c10f7146d809f4a256c373f462d9bba8cf6ba"
+  integrity sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug==
   dependencies:
     "@babel/helper-compilation-targets" "^7.22.6"
     "@babel/helper-plugin-utils" "^7.22.5"
@@ -203,7 +203,7 @@
   dependencies:
     "@babel/types" "^7.22.15"
 
-"@babel/helper-module-transforms@^7.22.15", "@babel/helper-module-transforms@^7.22.5", "@babel/helper-module-transforms@^7.22.9", "@babel/helper-module-transforms@^7.23.0":
+"@babel/helper-module-transforms@^7.22.5", "@babel/helper-module-transforms@^7.23.0":
   version "7.23.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz#3ec246457f6c842c0aee62a01f60739906f7047e"
   integrity sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==
@@ -226,6 +226,15 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295"
   integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==
 
+"@babel/helper-remap-async-to-generator@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz#7b68e1cb4fa964d2996fd063723fb48eca8498e0"
+  integrity sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-wrap-function" "^7.22.20"
+
 "@babel/helper-remap-async-to-generator@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.5.tgz#14a38141a7bf2165ad38da61d61cf27b43015da2"
@@ -236,15 +245,6 @@
     "@babel/helper-wrap-function" "^7.22.5"
     "@babel/types" "^7.22.5"
 
-"@babel/helper-remap-async-to-generator@^7.22.9":
-  version "7.22.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.9.tgz#53a25b7484e722d7efb9c350c75c032d4628de82"
-  integrity sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-environment-visitor" "^7.22.5"
-    "@babel/helper-wrap-function" "^7.22.9"
-
 "@babel/helper-replace-supers@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.5.tgz#71bc5fb348856dea9fdc4eafd7e2e49f585145dc"
@@ -319,6 +319,15 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz#694c30dfa1d09a6534cdfcafbe56789d36aba040"
   integrity sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==
 
+"@babel/helper-wrap-function@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz#15352b0b9bfb10fc9c76f79f6342c00e3411a569"
+  integrity sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==
+  dependencies:
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/template" "^7.22.15"
+    "@babel/types" "^7.22.19"
+
 "@babel/helper-wrap-function@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.5.tgz#44d205af19ed8d872b4eefb0d2fa65f45eb34f06"
@@ -329,22 +338,13 @@
     "@babel/traverse" "^7.22.5"
     "@babel/types" "^7.22.5"
 
-"@babel/helper-wrap-function@^7.22.9":
-  version "7.22.10"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.10.tgz#d845e043880ed0b8c18bd194a12005cb16d2f614"
-  integrity sha512-OnMhjWjuGYtdoO3FmsEFWvBStBAe2QOgwOLsLNDjN+aaiMD8InJk1/O3HSD8lkqTjCgg5YI34Tz15KNNA3p+nQ==
-  dependencies:
-    "@babel/helper-function-name" "^7.22.5"
-    "@babel/template" "^7.22.5"
-    "@babel/types" "^7.22.10"
-
-"@babel/helpers@^7.23.0":
-  version "7.23.1"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.1.tgz#44e981e8ce2b9e99f8f0b703f3326a4636c16d15"
-  integrity sha512-chNpneuK18yW5Oxsr+t553UZzzAs3aZnFm4bxhebsNTeshrC95yA7l5yl7GBAG+JG1rF0F7zzD2EixK9mWSDoA==
+"@babel/helpers@^7.23.2":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.2.tgz#2832549a6e37d484286e15ba36a5330483cac767"
+  integrity sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ==
   dependencies:
     "@babel/template" "^7.22.15"
-    "@babel/traverse" "^7.23.0"
+    "@babel/traverse" "^7.23.2"
     "@babel/types" "^7.23.0"
 
 "@babel/highlight@^7.10.4":
@@ -546,14 +546,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-async-generator-functions@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.15.tgz#3b153af4a6b779f340d5b80d3f634f55820aefa3"
-  integrity sha512-jBm1Es25Y+tVoTi5rfd5t1KLmL8ogLKpXszboWOTTtGFGz2RKnQe2yn7HbZ+kb/B8N0FVSGQo874NSlOU1T4+w==
+"@babel/plugin-transform-async-generator-functions@^7.23.2":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.2.tgz#054afe290d64c6f576f371ccc321772c8ea87ebb"
+  integrity sha512-BBYVGxbDVHfoeXbOwcagAkOQAm9NxoTdMGfTqghu1GrvadSaw6iW3Je6IcL5PNOw8VwjxqBECXy50/iCQSY/lQ==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.20"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-remap-async-to-generator" "^7.22.9"
+    "@babel/helper-remap-async-to-generator" "^7.22.20"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
 "@babel/plugin-transform-async-to-generator@^7.22.5":
@@ -572,10 +572,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-block-scoping@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.15.tgz#494eb82b87b5f8b1d8f6f28ea74078ec0a10a841"
-  integrity sha512-G1czpdJBZCtngoK1sJgloLiOHUnkb/bLZwqVZD8kXmq0ZnVfTTWUcs9OWtp0mBtYJ+4LQY1fllqBkOIPhXmFmw==
+"@babel/plugin-transform-block-scoping@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.0.tgz#8744d02c6c264d82e1a4bc5d2d501fd8aff6f022"
+  integrity sha512-cOsrbmIOXmf+5YbL99/S49Y3j46k/T16b9ml8bm9lP6N9US5iQ2yBK7gpui1pg0V/WMcXdkfKbTb7HXq9u+v4g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
@@ -619,10 +619,10 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/template" "^7.22.5"
 
-"@babel/plugin-transform-destructuring@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.15.tgz#e7404ea5bb3387073b9754be654eecb578324694"
-  integrity sha512-HzG8sFl1ZVGTme74Nw+X01XsUTqERVQ6/RLHo3XjGRzm7XD6QTtfS3NJotVgCGy8BzkDqRjRBD8dAyJn5TuvSQ==
+"@babel/plugin-transform-destructuring@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.0.tgz#6447aa686be48b32eaf65a73e0e2c0bd010a266c"
+  integrity sha512-vaMdgNXFkYrB+8lbgniSYWHsgqK5gjaMNcc84bMIOMRLH0L9AqYq3hwMdvnyqj1OPqea8UtjPEuS/DCenah1wg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
@@ -711,32 +711,32 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-amd@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz#4e045f55dcf98afd00f85691a68fc0780704f526"
-  integrity sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==
+"@babel/plugin-transform-modules-amd@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.0.tgz#05b2bc43373faa6d30ca89214731f76f966f3b88"
+  integrity sha512-xWT5gefv2HGSm4QHtgc1sYPbseOyf+FFDo2JbpE25GWl5BqTGO9IMwTYJRoIdjsF85GE+VegHxSCUt5EvoYTAw==
   dependencies:
-    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.23.0"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-commonjs@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.15.tgz#b11810117ed4ee7691b29bd29fd9f3f98276034f"
-  integrity sha512-jWL4eh90w0HQOTKP2MoXXUpVxilxsB2Vl4ji69rSjS3EcZ/v4sBmn+A3NpepuJzBhOaEBbR7udonlHHn5DWidg==
+"@babel/plugin-transform-modules-commonjs@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.0.tgz#b3dba4757133b2762c00f4f94590cf6d52602481"
+  integrity sha512-32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.22.15"
+    "@babel/helper-module-transforms" "^7.23.0"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-simple-access" "^7.22.5"
 
-"@babel/plugin-transform-modules-systemjs@^7.22.11":
-  version "7.22.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.11.tgz#3386be5875d316493b517207e8f1931d93154bb1"
-  integrity sha512-rIqHmHoMEOhI3VkVf5jQ15l539KrwhzqcBO6wdCNWPWc/JWt9ILNYNUssbRpeq0qWns8svuw8LnMNCvWBIJ8wA==
+"@babel/plugin-transform-modules-systemjs@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.0.tgz#77591e126f3ff4132a40595a6cccd00a6b60d160"
+  integrity sha512-qBej6ctXZD2f+DhlOC9yO47yEYgUh5CZNz/aBoH4j/3NOlRfJXJbY7xDQCqQVf9KbrqGzIWER1f23doHGrIHFg==
   dependencies:
     "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-module-transforms" "^7.22.9"
+    "@babel/helper-module-transforms" "^7.23.0"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-validator-identifier" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.20"
 
 "@babel/plugin-transform-modules-umd@^7.22.5":
   version "7.22.5"
@@ -804,10 +804,10 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-transform-optional-chaining@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.15.tgz#d7a5996c2f7ca4ad2ad16dbb74444e5c4385b1ba"
-  integrity sha512-ngQ2tBhq5vvSJw2Q2Z9i7ealNkpDMU0rGWnHPKqRZO0tzZ5tlaoz4hDvhXioOoaE0X2vfNss1djwg0DXlfu30A==
+"@babel/plugin-transform-optional-chaining@^7.22.15", "@babel/plugin-transform-optional-chaining@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.0.tgz#73ff5fc1cf98f542f09f29c0631647d8ad0be158"
+  integrity sha512-sBBGXbLJjxTzLBF5rFWaikMnOGOk/BmK6vVByIdEggZ7Vn6CvWXZyRkkLFK6WE0IF8jSliyOkUN6SScFgzCM0g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
@@ -860,16 +860,16 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-runtime@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.15.tgz#3a625c4c05a39e932d7d34f5d4895cdd0172fdc9"
-  integrity sha512-tEVLhk8NRZSmwQ0DJtxxhTrCht1HVo8VaMzYT4w6lwyKBuHsgoioAUA7/6eT2fRfc5/23fuGdlwIxXhRVgWr4g==
+"@babel/plugin-transform-runtime@^7.23.2":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.23.2.tgz#c956a3f8d1aa50816ff6c30c6288d66635c12990"
+  integrity sha512-XOntj6icgzMS58jPVtQpiuF6ZFWxQiJavISGx5KGjRj+3gqZr8+N6Kx+N9BApWzgS+DOjIZfXXj0ZesenOWDyA==
   dependencies:
     "@babel/helper-module-imports" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
-    babel-plugin-polyfill-corejs2 "^0.4.5"
-    babel-plugin-polyfill-corejs3 "^0.8.3"
-    babel-plugin-polyfill-regenerator "^0.5.2"
+    babel-plugin-polyfill-corejs2 "^0.4.6"
+    babel-plugin-polyfill-corejs3 "^0.8.5"
+    babel-plugin-polyfill-regenerator "^0.5.3"
     semver "^6.3.1"
 
 "@babel/plugin-transform-shorthand-properties@^7.22.5":
@@ -939,12 +939,12 @@
     "@babel/helper-create-regexp-features-plugin" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/preset-env@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.22.20.tgz#de9e9b57e1127ce0a2f580831717f7fb677ceedb"
-  integrity sha512-11MY04gGC4kSzlPHRfvVkNAZhUxOvm7DCJ37hPDnUENwe06npjIRAfInEMTGSb4LZK5ZgDFkv5hw0lGebHeTyg==
+"@babel/preset-env@^7.23.2":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.23.2.tgz#1f22be0ff0e121113260337dbc3e58fafce8d059"
+  integrity sha512-BW3gsuDD+rvHL2VO2SjAUNTBe5YrjsTiDyqamPDWY723na3/yPQ65X5oQkFVJZ0o50/2d+svm1rkPoJeR1KxVQ==
   dependencies:
-    "@babel/compat-data" "^7.22.20"
+    "@babel/compat-data" "^7.23.2"
     "@babel/helper-compilation-targets" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-validator-option" "^7.22.15"
@@ -970,15 +970,15 @@
     "@babel/plugin-syntax-top-level-await" "^7.14.5"
     "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6"
     "@babel/plugin-transform-arrow-functions" "^7.22.5"
-    "@babel/plugin-transform-async-generator-functions" "^7.22.15"
+    "@babel/plugin-transform-async-generator-functions" "^7.23.2"
     "@babel/plugin-transform-async-to-generator" "^7.22.5"
     "@babel/plugin-transform-block-scoped-functions" "^7.22.5"
-    "@babel/plugin-transform-block-scoping" "^7.22.15"
+    "@babel/plugin-transform-block-scoping" "^7.23.0"
     "@babel/plugin-transform-class-properties" "^7.22.5"
     "@babel/plugin-transform-class-static-block" "^7.22.11"
     "@babel/plugin-transform-classes" "^7.22.15"
     "@babel/plugin-transform-computed-properties" "^7.22.5"
-    "@babel/plugin-transform-destructuring" "^7.22.15"
+    "@babel/plugin-transform-destructuring" "^7.23.0"
     "@babel/plugin-transform-dotall-regex" "^7.22.5"
     "@babel/plugin-transform-duplicate-keys" "^7.22.5"
     "@babel/plugin-transform-dynamic-import" "^7.22.11"
@@ -990,9 +990,9 @@
     "@babel/plugin-transform-literals" "^7.22.5"
     "@babel/plugin-transform-logical-assignment-operators" "^7.22.11"
     "@babel/plugin-transform-member-expression-literals" "^7.22.5"
-    "@babel/plugin-transform-modules-amd" "^7.22.5"
-    "@babel/plugin-transform-modules-commonjs" "^7.22.15"
-    "@babel/plugin-transform-modules-systemjs" "^7.22.11"
+    "@babel/plugin-transform-modules-amd" "^7.23.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.23.0"
+    "@babel/plugin-transform-modules-systemjs" "^7.23.0"
     "@babel/plugin-transform-modules-umd" "^7.22.5"
     "@babel/plugin-transform-named-capturing-groups-regex" "^7.22.5"
     "@babel/plugin-transform-new-target" "^7.22.5"
@@ -1001,7 +1001,7 @@
     "@babel/plugin-transform-object-rest-spread" "^7.22.15"
     "@babel/plugin-transform-object-super" "^7.22.5"
     "@babel/plugin-transform-optional-catch-binding" "^7.22.11"
-    "@babel/plugin-transform-optional-chaining" "^7.22.15"
+    "@babel/plugin-transform-optional-chaining" "^7.23.0"
     "@babel/plugin-transform-parameters" "^7.22.15"
     "@babel/plugin-transform-private-methods" "^7.22.5"
     "@babel/plugin-transform-private-property-in-object" "^7.22.11"
@@ -1018,10 +1018,10 @@
     "@babel/plugin-transform-unicode-regex" "^7.22.5"
     "@babel/plugin-transform-unicode-sets-regex" "^7.22.5"
     "@babel/preset-modules" "0.1.6-no-external-plugins"
-    "@babel/types" "^7.22.19"
-    babel-plugin-polyfill-corejs2 "^0.4.5"
-    babel-plugin-polyfill-corejs3 "^0.8.3"
-    babel-plugin-polyfill-regenerator "^0.5.2"
+    "@babel/types" "^7.23.0"
+    babel-plugin-polyfill-corejs2 "^0.4.6"
+    babel-plugin-polyfill-corejs3 "^0.8.5"
+    babel-plugin-polyfill-regenerator "^0.5.3"
     core-js-compat "^3.31.0"
     semver "^6.3.1"
 
@@ -1055,10 +1055,10 @@
     "@babel/parser" "^7.22.15"
     "@babel/types" "^7.22.15"
 
-"@babel/traverse@^7.22.5", "@babel/traverse@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.0.tgz#18196ddfbcf4ccea324b7f6d3ada00d8c5a99c53"
-  integrity sha512-t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw==
+"@babel/traverse@^7.22.5", "@babel/traverse@^7.23.2":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8"
+  integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==
   dependencies:
     "@babel/code-frame" "^7.22.13"
     "@babel/generator" "^7.23.0"
@@ -1071,7 +1071,7 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.18.6", "@babel/types@^7.22.10", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
+"@babel/types@^7.0.0", "@babel/types@^7.18.6", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
   version "7.23.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb"
   integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==
@@ -1486,12 +1486,12 @@
   dependencies:
     "@sinonjs/commons" "^2.0.0"
 
-"@testing-library/jest-dom@^6.1.3":
-  version "6.1.3"
-  resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-6.1.3.tgz#443118c9e4043f96396f120de2c7122504a079c5"
-  integrity sha512-YzpjRHoCBWPzpPNtg6gnhasqtE/5O4qz8WCwDEaxtfnPO6gkaLrnuXusrGSPyhIGPezr1HM7ZH0CFaUTY9PJEQ==
+"@testing-library/jest-dom@^6.1.4":
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-6.1.4.tgz#cf0835c33bc5ef00befb9e672b1e3e6a710e30e3"
+  integrity sha512-wpoYrCYwSZ5/AxcrjLxJmCU6I5QAJXslEeSiMQqaWmP2Kzpd1LvF/qxmAIW2qposULGWq2gw30GgVNFLSc2Jnw==
   dependencies:
-    "@adobe/css-tools" "^4.3.0"
+    "@adobe/css-tools" "^4.3.1"
     "@babel/runtime" "^7.9.2"
     aria-query "^5.0.0"
     chalk "^3.0.0"
@@ -1666,10 +1666,10 @@
   dependencies:
     "@types/istanbul-lib-report" "*"
 
-"@types/jest@^29.5.5":
-  version "29.5.5"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.5.tgz#727204e06228fe24373df9bae76b90f3e8236a2a"
-  integrity sha512-ebylz2hnsWR9mYvmBFbXJXr+33UPc4+ZdxyDXh5w0FlPBTfCVN3wPL+kuOiQt3xvrK419v7XWeAs+AeOksafXg==
+"@types/jest@^29.5.6":
+  version "29.5.6"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.6.tgz#f4cf7ef1b5b0bfc1aa744e41b24d9cc52533130b"
+  integrity sha512-/t9NnzkOpXb4Nfvg17ieHE6EeSjDS2SGSpNYfoLbUAeL/EOueU/RSdOWFpfQTXBEM7BguYW1XQ0EbM+6RlIh6w==
   dependencies:
     expect "^29.0.0"
     pretty-format "^29.0.0"
@@ -2388,15 +2388,15 @@ array-flatten@^2.1.2:
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
   integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
 
-array-includes@^3.1.6:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.6.tgz#9e9e720e194f198266ba9e18c29e6a9b0e4b225f"
-  integrity sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==
+array-includes@^3.1.7:
+  version "3.1.7"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.7.tgz#8cd2e01b26f7a3086cbc87271593fe921c62abda"
+  integrity sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-    get-intrinsic "^1.1.3"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    get-intrinsic "^1.2.1"
     is-string "^1.0.7"
 
 array-union@^2.1.0:
@@ -2404,45 +2404,46 @@ array-union@^2.1.0:
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
-array.prototype.findlastindex@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.2.tgz#bc229aef98f6bd0533a2bc61ff95209875526c9b"
-  integrity sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==
+array.prototype.findlastindex@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz#b37598438f97b579166940814e2c0493a4f50207"
+  integrity sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
     es-shim-unscopables "^1.0.0"
-    get-intrinsic "^1.1.3"
+    get-intrinsic "^1.2.1"
 
-array.prototype.flat@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2"
-  integrity sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==
+array.prototype.flat@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz#1476217df8cff17d72ee8f3ba06738db5b387d18"
+  integrity sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
     es-shim-unscopables "^1.0.0"
 
-array.prototype.flatmap@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz#1aae7903c2100433cb8261cd4ed310aab5c4a183"
-  integrity sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==
+array.prototype.flatmap@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz#c9a7c6831db8e719d6ce639190146c24bbd3e527"
+  integrity sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
     es-shim-unscopables "^1.0.0"
 
-arraybuffer.prototype.slice@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz#9b5ea3868a6eebc30273da577eb888381c0044bb"
-  integrity sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==
+arraybuffer.prototype.slice@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz#98bd561953e3e74bb34938e77647179dfe6e9f12"
+  integrity sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==
   dependencies:
     array-buffer-byte-length "^1.0.0"
     call-bind "^1.0.2"
     define-properties "^1.2.0"
+    es-abstract "^1.22.1"
     get-intrinsic "^1.2.1"
     is-array-buffer "^3.0.2"
     is-shared-array-buffer "^1.0.2"
@@ -2806,29 +2807,29 @@ babel-plugin-jest-hoist@^29.6.3:
     "@types/babel__core" "^7.1.14"
     "@types/babel__traverse" "^7.0.6"
 
-babel-plugin-polyfill-corejs2@^0.4.5:
-  version "0.4.5"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.5.tgz#8097b4cb4af5b64a1d11332b6fb72ef5e64a054c"
-  integrity sha512-19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg==
+babel-plugin-polyfill-corejs2@^0.4.6:
+  version "0.4.6"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.6.tgz#b2df0251d8e99f229a8e60fc4efa9a68b41c8313"
+  integrity sha512-jhHiWVZIlnPbEUKSSNb9YoWcQGdlTLq7z1GHL4AjFxaoOUMuuEVJ+Y4pAaQUGOGk93YsVCKPbqbfw3m0SM6H8Q==
   dependencies:
     "@babel/compat-data" "^7.22.6"
-    "@babel/helper-define-polyfill-provider" "^0.4.2"
+    "@babel/helper-define-polyfill-provider" "^0.4.3"
     semver "^6.3.1"
 
-babel-plugin-polyfill-corejs3@^0.8.3:
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.3.tgz#b4f719d0ad9bb8e0c23e3e630c0c8ec6dd7a1c52"
-  integrity sha512-z41XaniZL26WLrvjy7soabMXrfPWARN25PZoriDEiLMxAp50AUW3t35BGQUMg5xK3UrpVTtagIDklxYa+MhiNA==
+babel-plugin-polyfill-corejs3@^0.8.5:
+  version "0.8.5"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.5.tgz#a75fa1b0c3fc5bd6837f9ec465c0f48031b8cab1"
+  integrity sha512-Q6CdATeAvbScWPNLB8lzSO7fgUVBkQt6zLgNlfyeCr/EQaEQR+bWiBYYPYAFyE528BMjRhL+1QBMOI4jc/c5TA==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.4.2"
-    core-js-compat "^3.31.0"
+    "@babel/helper-define-polyfill-provider" "^0.4.3"
+    core-js-compat "^3.32.2"
 
-babel-plugin-polyfill-regenerator@^0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.2.tgz#80d0f3e1098c080c8b5a65f41e9427af692dc326"
-  integrity sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA==
+babel-plugin-polyfill-regenerator@^0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.3.tgz#d4c49e4b44614607c13fb769bcd85c72bb26a4a5"
+  integrity sha512-8sHeDOmXC8csczMrYEOf0UTNa4yE2SxV5JGeT/LP1n0OYVDUUFPxG9vdk2AlDlIit4t+Kf0xCtpgXPBwnn/9pw==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.4.2"
+    "@babel/helper-define-polyfill-provider" "^0.4.3"
 
 babel-plugin-syntax-async-functions@^6.8.0:
   version "6.13.0"
@@ -3492,15 +3493,15 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.21.10, browserslist@^4.21.4, browserslist@^4.21.9:
-  version "4.21.10"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.10.tgz#dbbac576628c13d3b2231332cb2ec5a46e015bb0"
-  integrity sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==
+browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.21.10, browserslist@^4.21.4, browserslist@^4.21.9, browserslist@^4.22.1:
+  version "4.22.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.1.tgz#ba91958d1a59b87dab6fed8dfbcb3da5e2e9c619"
+  integrity sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==
   dependencies:
-    caniuse-lite "^1.0.30001517"
-    electron-to-chromium "^1.4.477"
+    caniuse-lite "^1.0.30001541"
+    electron-to-chromium "^1.4.535"
     node-releases "^2.0.13"
-    update-browserslist-db "^1.0.11"
+    update-browserslist-db "^1.0.13"
 
 bser@2.1.1:
   version "2.1.1"
@@ -3585,6 +3586,15 @@ call-bind@^1.0.0, call-bind@^1.0.2:
     function-bind "^1.1.1"
     get-intrinsic "^1.0.2"
 
+call-bind@^1.0.4, call-bind@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.5.tgz#6fa2b7845ce0ea49bf4d8b9ef64727a2c2e2e513"
+  integrity sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==
+  dependencies:
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.1"
+    set-function-length "^1.1.1"
+
 callsites@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
@@ -3627,11 +3637,16 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001517, caniuse-lite@^1.0.30001524, caniuse-lite@^1.0.30001538:
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001524, caniuse-lite@^1.0.30001538:
   version "1.0.30001539"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001539.tgz#325a387ab1ed236df2c12dc6cd43a4fff9903a44"
   integrity sha512-hfS5tE8bnNiNvEOEkm8HElUHroYwlqMMENEzELymy77+tJ6m+gA2krtHl5hxJaj71OlpC2cHZbdSMX1/YEqEkA==
 
+caniuse-lite@^1.0.30001541:
+  version "1.0.30001547"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001547.tgz#d4f92efc488aab3c7f92c738d3977c2a3180472b"
+  integrity sha512-W7CrtIModMAxobGhz8iXmDfuJiiKg1WADMO/9x7/CLNin5cpSbuBjooyoIUVB5eyCc36QuTVlkVa1iB2S5+/eA==
+
 chalk@4.1.2, chalk@^4.0.0, chalk@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
@@ -3868,10 +3883,10 @@ commander@^10.0.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06"
   integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==
 
-commander@^11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-11.0.0.tgz#43e19c25dbedc8256203538e8d7e9346877a6f67"
-  integrity sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==
+commander@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-11.1.0.tgz#62fdce76006a68e5c1ab3314dc92e800eb83d906"
+  integrity sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==
 
 commander@^2.19.0, commander@^2.20.0:
   version "2.20.3"
@@ -4006,17 +4021,17 @@ cookie@0.5.0:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
   integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
 
-core-js-compat@^3.31.0:
-  version "3.31.1"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.31.1.tgz#5084ad1a46858df50ff89ace152441a63ba7aae0"
-  integrity sha512-wIDWd2s5/5aJSdpOJHfSibxNODxoGoWOBHt8JSPB41NOE94M7kuTPZCYLOlTtuoXTsBPKobpJ6T+y0SSy5L9SA==
+core-js-compat@^3.31.0, core-js-compat@^3.32.2:
+  version "3.33.0"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.33.0.tgz#24aa230b228406450b2277b7c8bfebae932df966"
+  integrity sha512-0w4LcLXsVEuNkIqwjjf9rjCoPhK8uqA4tMRh4Ge26vfLtUutshn+aRJU21I9LCJlh2QQHfisNToLjw1XEJLTWw==
   dependencies:
-    browserslist "^4.21.9"
+    browserslist "^4.22.1"
 
-core-js@3.32, core-js@^3, core-js@^3.32:
-  version "3.32.2"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.32.2.tgz#172fb5949ef468f93b4be7841af6ab1f21992db7"
-  integrity sha512-pxXSw1mYZPDGvTQqEc5vgIb83jGQKFGYWY76z4a7weZXUolw3G+OvpZqSRcfYOoOVUQJYEPsWeQK8pKEnUtWxQ==
+core-js@3.33, core-js@^3, core-js@^3.33:
+  version "3.33.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.33.1.tgz#ef3766cfa382482d0a2c2bc5cb52c6d88805da52"
+  integrity sha512-qVSq3s+d4+GsqN0teRCJtM6tdEEXyWxjzbhVrCHmBS5ZTM0FS2MOS0D13dUXAWDUN6a+lHI/N1hF9Ytz6iLl9Q==
 
 core-js@^1.0.0:
   version "1.2.7"
@@ -4284,10 +4299,10 @@ csv-generator-client@^2.1.1:
     babel-polyfill "^6.26.0"
     lodash "^4.17.4"
 
-csv-parse@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/csv-parse/-/csv-parse-5.5.0.tgz#2313421e69b650dae32a79ac884b20b21ca1d9da"
-  integrity sha512-RxruSK3M4XgzcD7Trm2wEN+SJ26ChIb903+IWxNOcB5q4jT2Cs+hFr6QP39J05EohshRFEvyzEBoZ/466S2sbw==
+csv-parse@^5.5.2:
+  version "5.5.2"
+  resolved "https://registry.yarnpkg.com/csv-parse/-/csv-parse-5.5.2.tgz#ab525e642093dccff7c5cca5c7b71fd3e99fe8f2"
+  integrity sha512-YRVtvdtUNXZCMyK5zd5Wty1W6dNTpGKdqQd4EQ8tl/c6KW1aMBB1Kg1ppky5FONKmEqGJ/8WjLlTNLPne4ioVA==
 
 csv-writer@^1.3.0:
   version "1.6.0"
@@ -4422,6 +4437,15 @@ default-gateway@^6.0.3:
   dependencies:
     execa "^5.0.0"
 
+define-data-property@^1.0.1, define-data-property@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.1.tgz#c35f7cd0ab09883480d12ac5cb213715587800b3"
+  integrity sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==
+  dependencies:
+    get-intrinsic "^1.2.1"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.0"
+
 define-lazy-prop@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
@@ -4697,10 +4721,10 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-electron-to-chromium@^1.4.477:
-  version "1.4.490"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.490.tgz#d99286f6e915667fa18ea4554def1aa60eb4d5f1"
-  integrity sha512-6s7NVJz+sATdYnIwhdshx/N/9O6rvMxmhVoDSDFdj6iA45gHR8EQje70+RYsF4GeB+k0IeNSBnP7yG9ZXJFr7A==
+electron-to-chromium@^1.4.535:
+  version "1.4.551"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.551.tgz#14db6660a88f66ce095ea2657abe5653bc7f42ed"
+  integrity sha512-/Ng/W/kFv7wdEHYzxdK7Cv0BHEGSkSB3M0Ssl8Ndr1eMiYeas/+Mv4cNaDqamqWx6nd2uQZfPz6g25z25M/sdw==
 
 emittery@^0.13.1:
   version "0.13.1"
@@ -4808,55 +4832,26 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.19.0, es-abstract@^1.19.5:
-  version "1.20.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.1.tgz#027292cd6ef44bd12b1913b828116f54787d1814"
-  integrity sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==
-  dependencies:
-    call-bind "^1.0.2"
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    function.prototype.name "^1.1.5"
-    get-intrinsic "^1.1.1"
-    get-symbol-description "^1.0.0"
-    has "^1.0.3"
-    has-property-descriptors "^1.0.0"
-    has-symbols "^1.0.3"
-    internal-slot "^1.0.3"
-    is-callable "^1.2.4"
-    is-negative-zero "^2.0.2"
-    is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.2"
-    is-string "^1.0.7"
-    is-weakref "^1.0.2"
-    object-inspect "^1.12.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.2"
-    regexp.prototype.flags "^1.4.3"
-    string.prototype.trimend "^1.0.5"
-    string.prototype.trimstart "^1.0.5"
-    unbox-primitive "^1.0.2"
-
-es-abstract@^1.20.4, es-abstract@^1.21.2:
-  version "1.22.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.1.tgz#8b4e5fc5cefd7f1660f0f8e1a52900dfbc9d9ccc"
-  integrity sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==
+es-abstract@^1.22.1:
+  version "1.22.3"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.3.tgz#48e79f5573198de6dee3589195727f4f74bc4f32"
+  integrity sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==
   dependencies:
     array-buffer-byte-length "^1.0.0"
-    arraybuffer.prototype.slice "^1.0.1"
+    arraybuffer.prototype.slice "^1.0.2"
     available-typed-arrays "^1.0.5"
-    call-bind "^1.0.2"
+    call-bind "^1.0.5"
     es-set-tostringtag "^2.0.1"
     es-to-primitive "^1.2.1"
-    function.prototype.name "^1.1.5"
-    get-intrinsic "^1.2.1"
+    function.prototype.name "^1.1.6"
+    get-intrinsic "^1.2.2"
     get-symbol-description "^1.0.0"
     globalthis "^1.0.3"
     gopd "^1.0.1"
-    has "^1.0.3"
     has-property-descriptors "^1.0.0"
     has-proto "^1.0.1"
     has-symbols "^1.0.3"
+    hasown "^2.0.0"
     internal-slot "^1.0.5"
     is-array-buffer "^3.0.2"
     is-callable "^1.2.7"
@@ -4864,23 +4859,23 @@ es-abstract@^1.20.4, es-abstract@^1.21.2:
     is-regex "^1.1.4"
     is-shared-array-buffer "^1.0.2"
     is-string "^1.0.7"
-    is-typed-array "^1.1.10"
+    is-typed-array "^1.1.12"
     is-weakref "^1.0.2"
-    object-inspect "^1.12.3"
+    object-inspect "^1.13.1"
     object-keys "^1.1.1"
     object.assign "^4.1.4"
-    regexp.prototype.flags "^1.5.0"
-    safe-array-concat "^1.0.0"
+    regexp.prototype.flags "^1.5.1"
+    safe-array-concat "^1.0.1"
     safe-regex-test "^1.0.0"
-    string.prototype.trim "^1.2.7"
-    string.prototype.trimend "^1.0.6"
-    string.prototype.trimstart "^1.0.6"
+    string.prototype.trim "^1.2.8"
+    string.prototype.trimend "^1.0.7"
+    string.prototype.trimstart "^1.0.7"
     typed-array-buffer "^1.0.0"
     typed-array-byte-length "^1.0.0"
     typed-array-byte-offset "^1.0.0"
     typed-array-length "^1.0.4"
     unbox-primitive "^1.0.2"
-    which-typed-array "^1.1.10"
+    which-typed-array "^1.1.13"
 
 es-module-lexer@^1.2.1:
   version "1.2.1"
@@ -4991,14 +4986,14 @@ eslint-config-vue@^2.0.2:
   resolved "https://registry.yarnpkg.com/eslint-config-vue/-/eslint-config-vue-2.0.2.tgz#a3ab1004899e49327a94c63e24d47a396b2f4848"
   integrity sha1-o6sQBImeSTJ6lMY+JNR6OWsvSEg=
 
-eslint-import-resolver-node@^0.3.7:
-  version "0.3.7"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz#83b375187d412324a1963d84fa664377a23eb4d7"
-  integrity sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==
+eslint-import-resolver-node@^0.3.9:
+  version "0.3.9"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz#d4eaac52b8a2e7c3cd1903eb00f7e053356118ac"
+  integrity sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==
   dependencies:
     debug "^3.2.7"
-    is-core-module "^2.11.0"
-    resolve "^1.22.1"
+    is-core-module "^2.13.0"
+    resolve "^1.22.4"
 
 eslint-module-utils@^2.8.0:
   version "2.8.0"
@@ -5020,26 +5015,26 @@ eslint-plugin-compat@^4.2.0:
     lodash.memoize "^4.1.2"
     semver "^7.5.4"
 
-eslint-plugin-import@^2.28.1:
-  version "2.28.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.28.1.tgz#63b8b5b3c409bfc75ebaf8fb206b07ab435482c4"
-  integrity sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==
+eslint-plugin-import@^2.29.0:
+  version "2.29.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.29.0.tgz#8133232e4329ee344f2f612885ac3073b0b7e155"
+  integrity sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==
   dependencies:
-    array-includes "^3.1.6"
-    array.prototype.findlastindex "^1.2.2"
-    array.prototype.flat "^1.3.1"
-    array.prototype.flatmap "^1.3.1"
+    array-includes "^3.1.7"
+    array.prototype.findlastindex "^1.2.3"
+    array.prototype.flat "^1.3.2"
+    array.prototype.flatmap "^1.3.2"
     debug "^3.2.7"
     doctrine "^2.1.0"
-    eslint-import-resolver-node "^0.3.7"
+    eslint-import-resolver-node "^0.3.9"
     eslint-module-utils "^2.8.0"
-    has "^1.0.3"
-    is-core-module "^2.13.0"
+    hasown "^2.0.0"
+    is-core-module "^2.13.1"
     is-glob "^4.0.3"
     minimatch "^3.1.2"
-    object.fromentries "^2.0.6"
-    object.groupby "^1.0.0"
-    object.values "^1.1.6"
+    object.fromentries "^2.0.7"
+    object.groupby "^1.0.1"
+    object.values "^1.1.7"
     semver "^6.3.1"
     tsconfig-paths "^3.14.2"
 
@@ -5634,6 +5629,11 @@ flat-cache@^3.0.4:
     flatted "^3.1.0"
     rimraf "^3.0.2"
 
+flat@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
+  integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
+
 flatted@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
@@ -5745,22 +5745,27 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
-function.prototype.name@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621"
-  integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==
+function-bind@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
+  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
+
+function.prototype.name@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd"
+  integrity sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.0"
-    functions-have-names "^1.2.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    functions-have-names "^1.2.3"
 
 functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
   integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
 
-functions-have-names@^1.2.2, functions-have-names@^1.2.3:
+functions-have-names@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
@@ -5807,7 +5812,7 @@ get-caller-file@^2.0.5:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.2.tgz#336975123e05ad0b7ba41f152ee4aadbea6cf598"
   integrity sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==
@@ -5835,6 +5840,16 @@ get-intrinsic@^1.2.0, get-intrinsic@^1.2.1:
     has-proto "^1.0.1"
     has-symbols "^1.0.3"
 
+get-intrinsic@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.2.tgz#281b7622971123e1ef4b3c90fd7539306da93f3b"
+  integrity sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==
+  dependencies:
+    function-bind "^1.1.2"
+    has-proto "^1.0.1"
+    has-symbols "^1.0.3"
+    hasown "^2.0.0"
+
 get-package-type@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
@@ -6118,6 +6133,13 @@ hash-sum@^1.0.2:
   resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-1.0.2.tgz#33b40777754c6432573c120cc3808bbd10d47f04"
   integrity sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=
 
+hasown@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c"
+  integrity sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==
+  dependencies:
+    function-bind "^1.1.2"
+
 he@^1.1.0, he@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
@@ -6533,15 +6555,6 @@ inquirer@^7.0.0:
     strip-ansi "^6.0.0"
     through "^2.3.6"
 
-internal-slot@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c"
-  integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==
-  dependencies:
-    get-intrinsic "^1.1.0"
-    has "^1.0.3"
-    side-channel "^1.0.4"
-
 internal-slot@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986"
@@ -6681,17 +6694,12 @@ is-callable@^1.1.4:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
   integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==
 
-is-callable@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
-  integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
-
-is-core-module@^2.11.0, is-core-module@^2.12.0, is-core-module@^2.13.0, is-core-module@^2.5.0:
-  version "2.13.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.0.tgz#bb52aa6e2cbd49a30c2ba68c42bf3435ba6072db"
-  integrity sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==
+is-core-module@^2.12.0, is-core-module@^2.13.0, is-core-module@^2.13.1, is-core-module@^2.5.0:
+  version "2.13.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384"
+  integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==
   dependencies:
-    has "^1.0.3"
+    hasown "^2.0.0"
 
 is-date-object@^1.0.1:
   version "1.0.2"
@@ -6888,7 +6896,7 @@ is-typed-array@^1.1.10, is-typed-array@^1.1.3:
     gopd "^1.0.1"
     has-tostringtag "^1.0.0"
 
-is-typed-array@^1.1.9:
+is-typed-array@^1.1.12, is-typed-array@^1.1.9:
   version "1.1.12"
   resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.12.tgz#d0bab5686ef4a76f7a73097b95470ab199c57d4a"
   integrity sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==
@@ -7640,9 +7648,9 @@ kolibri-constants@0.2.0:
   resolved "https://registry.yarnpkg.com/kolibri-constants/-/kolibri-constants-0.2.0.tgz#47c9d773894e23251ba5ac4db420822e45603142"
   integrity sha512-WYDMGDzB9gNxRbpX1O2cGe1HrJvLvSZGwMuAv6dqrxJgPf7iO+Hi40/1CXjHM7nk5CRt+hn5bqnMzCBmj1omPA==
 
-"kolibri-design-system@https://github.com/learningequality/kolibri-design-system#3ab9801a442b20ddf63248b17ca0d83fe21133fb":
+"kolibri-design-system@https://github.com/learningequality/kolibri-design-system#ab03c5e257a7806c67cf6250310e3e6ccb5119c9":
   version "1.3.0"
-  resolved "https://github.com/learningequality/kolibri-design-system#3ab9801a442b20ddf63248b17ca0d83fe21133fb"
+  resolved "https://github.com/learningequality/kolibri-design-system#ab03c5e257a7806c67cf6250310e3e6ccb5119c9"
   dependencies:
     aphrodite "https://github.com/learningequality/aphrodite/"
     autosize "^3.0.21"
@@ -7656,20 +7664,20 @@ kolibri-constants@0.2.0:
     tippy.js "^4.2.1"
     vue-intl "^3.1.0"
 
-launch-editor-middleware@^2.5.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/launch-editor-middleware/-/launch-editor-middleware-2.6.0.tgz#2ba4fe4b695d7fe3d44dee86b6d46d57b8332dfd"
-  integrity sha512-K2yxgljj5TdCeRN1lBtO3/J26+AIDDDw+04y6VAiZbWcTdBwsYN6RrZBnW5DN/QiSIdKNjKdATLUUluWWFYTIA==
+launch-editor-middleware@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/launch-editor-middleware/-/launch-editor-middleware-2.6.1.tgz#7f2f400d8dda2283b69d02e9d83b1d272fef2bfb"
+  integrity sha512-Fg/xYhf7ARmRp40n18wIfJyuAMEjXo67Yull7uF7d0OJ3qA4EYJISt1XfPPn69IIJ5jKgQwzcg6DqHYo95LL/g==
   dependencies:
-    launch-editor "^2.6.0"
+    launch-editor "^2.6.1"
 
-launch-editor@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.6.0.tgz#4c0c1a6ac126c572bd9ff9a30da1d2cae66defd7"
-  integrity sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==
+launch-editor@^2.6.0, launch-editor@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.6.1.tgz#f259c9ef95cbc9425620bbbd14b468fcdb4ffe3c"
+  integrity sha512-eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw==
   dependencies:
     picocolors "^1.0.0"
-    shell-quote "^1.7.3"
+    shell-quote "^1.8.1"
 
 leven@^3.1.0:
   version "3.1.0"
@@ -8520,16 +8528,16 @@ object-fit-images@^3.2.4:
   resolved "https://registry.yarnpkg.com/object-fit-images/-/object-fit-images-3.2.4.tgz#6c299d38fdf207746e5d2d46c2877f6f25d15b52"
   integrity sha512-G+7LzpYfTfqUyrZlfrou/PLLLAPNC52FTy5y1CBywX+1/FkxIloOyQXBmZ3Zxa2AWO+lMF0JTuvqbr7G5e5CWg==
 
-object-inspect@^1.12.0, object-inspect@^1.9.0:
+object-inspect@^1.13.1:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2"
+  integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==
+
+object-inspect@^1.9.0:
   version "1.12.2"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea"
   integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==
 
-object-inspect@^1.12.3:
-  version "1.12.3"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9"
-  integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
-
 object-is@^1.0.1:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac"
@@ -8543,7 +8551,7 @@ object-keys@^1.0.12, object-keys@^1.1.1:
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object.assign@^4.1.2, object.assign@^4.1.4:
+object.assign@^4.1.4:
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
   integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
@@ -8553,33 +8561,33 @@ object.assign@^4.1.2, object.assign@^4.1.4:
     has-symbols "^1.0.3"
     object-keys "^1.1.1"
 
-object.fromentries@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.6.tgz#cdb04da08c539cffa912dcd368b886e0904bfa73"
-  integrity sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==
+object.fromentries@^2.0.7:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.7.tgz#71e95f441e9a0ea6baf682ecaaf37fa2a8d7e616"
+  integrity sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
-object.groupby@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.0.tgz#cb29259cf90f37e7bac6437686c1ea8c916d12a9"
-  integrity sha512-70MWG6NfRH9GnbZOikuhPPYzpUpof9iW2J9E4dW7FXTqPNb6rllE6u39SKwwiNh8lCwX3DDb5OgcKGiEBrTTyw==
+object.groupby@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.1.tgz#d41d9f3c8d6c778d9cbac86b4ee9f5af103152ee"
+  integrity sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.2.0"
-    es-abstract "^1.21.2"
+    es-abstract "^1.22.1"
     get-intrinsic "^1.2.1"
 
-object.values@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.6.tgz#4abbaa71eba47d63589d402856f908243eea9b1d"
-  integrity sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==
+object.values@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.7.tgz#617ed13272e7e1071b43973aa1655d9291b8442a"
+  integrity sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
 obuf@^1.0.0, obuf@^1.1.2:
   version "1.1.2"
@@ -9678,23 +9686,14 @@ regenerator-transform@^0.15.2:
   dependencies:
     "@babel/runtime" "^7.8.4"
 
-regexp.prototype.flags@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"
-  integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    functions-have-names "^1.2.2"
-
-regexp.prototype.flags@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz#fe7ce25e7e4cca8db37b6634c8a2c7009199b9cb"
-  integrity sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==
+regexp.prototype.flags@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz#90ce989138db209f81492edd734183ce99f9677e"
+  integrity sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.2.0"
-    functions-have-names "^1.2.3"
+    set-function-name "^2.0.0"
 
 regexpp@^2.0.1:
   version "2.0.1"
@@ -9840,7 +9839,7 @@ resolve.exports@^2.0.0:
   resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.0.tgz#c1a0028c2d166ec2fbf7d0644584927e76e7400e"
   integrity sha512-6K/gDlqgQscOlg9fSRpWstA8sYe8rbELsSTNpx+3kTrsVCzvSl0zIvRErM7fdl9ERWDsKnrLnwB+Ne89918XOg==
 
-resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.1:
+resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.0:
   version "1.22.3"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.3.tgz#4b4055349ffb962600972da1fdc33c46a4eb3283"
   integrity sha512-P8ur/gp/AmbEzjr729bZnLjXK5Z+4P0zhIJgBgzqRih7hL7BOukHGtSTA3ACMY467GRFz3duQsi0bDZdR7DKdw==
@@ -9849,6 +9848,15 @@ resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.1:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
+resolve@^1.22.4:
+  version "1.22.8"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
+  integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
+  dependencies:
+    is-core-module "^2.13.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
@@ -9942,13 +9950,13 @@ rxjs@^7.8.0:
   dependencies:
     tslib "^2.1.0"
 
-safe-array-concat@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.0.0.tgz#2064223cba3c08d2ee05148eedbc563cd6d84060"
-  integrity sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==
+safe-array-concat@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.0.1.tgz#91686a63ce3adbea14d61b14c99572a8ff84754c"
+  integrity sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==
   dependencies:
     call-bind "^1.0.2"
-    get-intrinsic "^1.2.0"
+    get-intrinsic "^1.2.1"
     has-symbols "^1.0.3"
     isarray "^2.0.5"
 
@@ -10145,6 +10153,25 @@ set-blocking@^2.0.0:
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
+set-function-length@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.1.1.tgz#4bc39fafb0307224a33e106a7d35ca1218d659ed"
+  integrity sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==
+  dependencies:
+    define-data-property "^1.1.1"
+    get-intrinsic "^1.2.1"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.0"
+
+set-function-name@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.1.tgz#12ce38b7954310b9f61faa12701620a0c882793a"
+  integrity sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==
+  dependencies:
+    define-data-property "^1.0.1"
+    functions-have-names "^1.2.3"
+    has-property-descriptors "^1.0.0"
+
 setimmediate@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
@@ -10196,7 +10223,7 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-shell-quote@^1.7.3, shell-quote@^1.8.0:
+shell-quote@^1.8.0, shell-quote@^1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680"
   integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==
@@ -10560,50 +10587,32 @@ string-width@^5.0.1, string-width@^5.1.2:
     emoji-regex "^9.2.2"
     strip-ansi "^7.0.1"
 
-string.prototype.trim@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz#a68352740859f6893f14ce3ef1bb3037f7a90533"
-  integrity sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-
-string.prototype.trimend@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz#914a65baaab25fbdd4ee291ca7dde57e869cb8d0"
-  integrity sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.19.5"
-
-string.prototype.trimend@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533"
-  integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==
+string.prototype.trim@^1.2.8:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz#f9ac6f8af4bd55ddfa8895e6aea92a96395393bd"
+  integrity sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
-string.prototype.trimstart@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz#5466d93ba58cfa2134839f81d7f42437e8c01fef"
-  integrity sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==
+string.prototype.trimend@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz#1bb3afc5008661d73e2dc015cd4853732d6c471e"
+  integrity sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.19.5"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
-string.prototype.trimstart@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4"
-  integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==
+string.prototype.trimstart@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz#d4cdb44b83a4737ffbac2d406e405d43d0184298"
+  integrity sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
 string_decoder@^1.1.1:
   version "1.3.0"
@@ -11358,10 +11367,10 @@ unpipe@1.0.0, unpipe@~1.0.0:
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
   integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
 
-update-browserslist-db@^1.0.11:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940"
-  integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==
+update-browserslist-db@^1.0.13:
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4"
+  integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==
   dependencies:
     escalade "^3.1.1"
     picocolors "^1.0.0"
@@ -11568,10 +11577,10 @@ vue-jest@^3.0.0:
     tsconfig "^7.0.0"
     vue-template-es2015-compiler "^1.6.0"
 
-vue-loader@^15.10.2:
-  version "15.10.2"
-  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.10.2.tgz#6dccfda8661caa7f5415806a5e386fd3258d8112"
-  integrity sha512-ndeSe/8KQc/nlA7TJ+OBhv2qalmj1s+uBs7yHDRFaAXscFTApBzY9F1jES3bautmgWjDlDct0fw8rPuySDLwxw==
+vue-loader@^15.11.1:
+  version "15.11.1"
+  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.11.1.tgz#dee91169211276ed43c5715caef88a56b1f497b0"
+  integrity sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q==
   dependencies:
     "@vue/component-compiler-utils" "^3.1.0"
     hash-sum "^1.0.2"
@@ -11780,12 +11789,13 @@ webpack-dev-server@^4.15.1:
     webpack-dev-middleware "^5.3.1"
     ws "^8.13.0"
 
-webpack-merge@^5.7.3, webpack-merge@^5.9.0:
-  version "5.9.0"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.9.0.tgz#dc160a1c4cf512ceca515cc231669e9ddb133826"
-  integrity sha512-6NbRQw4+Sy50vYNTw7EyOn41OZItPiXB8GNv3INSoe3PSFaHJEz3SHTrYVaRm2LilNGnFUzh0FAwqPEmU/CwDg==
+webpack-merge@^5.10.0, webpack-merge@^5.7.3:
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.10.0.tgz#a3ad5d773241e9c682803abf628d4cd62b8a4177"
+  integrity sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==
   dependencies:
     clone-deep "^4.0.1"
+    flat "^5.0.2"
     wildcard "^2.0.0"
 
 webpack-sources@^3.2.3:
@@ -11793,10 +11803,10 @@ webpack-sources@^3.2.3:
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
-webpack@^5.88.2:
-  version "5.88.2"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.88.2.tgz#f62b4b842f1c6ff580f3fcb2ed4f0b579f4c210e"
-  integrity sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==
+webpack@^5.89.0:
+  version "5.89.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.89.0.tgz#56b8bf9a34356e93a6625770006490bf3a7f32dc"
+  integrity sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==
   dependencies:
     "@types/eslint-scope" "^3.7.3"
     "@types/estree" "^1.0.0"
@@ -11881,7 +11891,7 @@ which-boxed-primitive@^1.0.2:
     is-string "^1.0.5"
     is-symbol "^1.0.3"
 
-which-typed-array@^1.1.10, which-typed-array@^1.1.11:
+which-typed-array@^1.1.11:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.11.tgz#99d691f23c72aab6768680805a271b69761ed61a"
   integrity sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==
@@ -11892,6 +11902,17 @@ which-typed-array@^1.1.10, which-typed-array@^1.1.11:
     gopd "^1.0.1"
     has-tostringtag "^1.0.0"
 
+which-typed-array@^1.1.13:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.13.tgz#870cd5be06ddb616f504e7b039c4c24898184d36"
+  integrity sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==
+  dependencies:
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.4"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    has-tostringtag "^1.0.0"
+
 which-typed-array@^1.1.2:
   version "1.1.9"
   resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6"