diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40a25dc3ce..46d5fa9ffe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,30 @@
List of the most important changes for each release.
+## 0.17.3
+
+### Changed
+- Improve learn folder contents display by @rtibbles in https://github.com/learningequality/kolibri/pull/12737
+- Update KDS theme token by @AllanOXDi in https://github.com/learningequality/kolibri/pull/12742
+- Final token updates by @marcellamaki in https://github.com/learningequality/kolibri/pull/12754
+
+### Added
+- Add Fulfulde translations by @radinamatic in https://github.com/learningequality/kolibri/pull/12738
+- Update morango for conditional indexes on store to improve deserialization performance. by @rtibbles in https://github.com/learningequality/kolibri/pull/12747
+
+### Fixed
+- Settings is not correct after tzlocal update by @jredrejo in https://github.com/learningequality/kolibri/pull/12683
+- Add missing `indeterminate` states on Select All checkboxes by @nucleogenesis in https://github.com/learningequality/kolibri/pull/12587
+- Fix import channel in Postgresql by @jredrejo in https://github.com/learningequality/kolibri/pull/12709
+- Branding tweaks by @rtibbles in https://github.com/learningequality/kolibri/pull/12736
+- Tweaks to CLI and message extraction utility function by @rtibbles in https://github.com/learningequality/kolibri/pull/12320
+- Delete resource from everywhere when force_delete is selected by @thesujai in https://github.com/learningequality/kolibri/pull/12680
+- Dont delete the entire channel when deleting a single content by @thesujai in https://github.com/learningequality/kolibri/pull/12740
+- Prevent access to undefined AttemptLogs while looking at reports by @LianaHarris360 in https://github.com/learningequality/kolibri/pull/12723
+- Update StorageNotification.vue to prevent undefined access if device plugin is disabled by @rtibbles in https://github.com/learningequality/kolibri/pull/12724
+- Update favicon to be available when the default theme is disabled by @marcellamaki in https://github.com/learningequality/kolibri/pull/12760
+- Fix on my own merge account KCheckbox issue by @AlexVelezLl in https://github.com/learningequality/kolibri/pull/12761
+
## 0.17.2
### Changed
diff --git a/kolibri/core/assets/src/core-app/apiSpec.js b/kolibri/core/assets/src/core-app/apiSpec.js
index 10486bc230..e74ebb160f 100644
--- a/kolibri/core/assets/src/core-app/apiSpec.js
+++ b/kolibri/core/assets/src/core-app/apiSpec.js
@@ -70,7 +70,6 @@ import Draggable from '../views/sortable/Draggable';
import DragHandle from '../views/sortable/DragHandle';
import DragContainer from '../views/sortable/DragContainer';
import DragSortWidget from '../views/sortable/DragSortWidget';
-import FocusTrap from '../views/FocusTrap';
import BottomAppBar from '../views/BottomAppBar';
import BaseToolbar from '../views/BaseToolbar';
import GenderSelect from '../views/userAccounts/GenderSelect';
@@ -169,7 +168,6 @@ export default {
DragHandle,
DragContainer,
DragSortWidget,
- FocusTrap,
BottomAppBar,
BaseToolbar,
GenderSelect,
diff --git a/kolibri/core/assets/src/views/CoreMenu/index.vue b/kolibri/core/assets/src/views/CoreMenu/index.vue
index 4fc6202687..c0f6a8986f 100644
--- a/kolibri/core/assets/src/views/CoreMenu/index.vue
+++ b/kolibri/core/assets/src/views/CoreMenu/index.vue
@@ -16,7 +16,7 @@
-
-
+
import last from 'lodash/last';
- import FocusTrap from 'kolibri.coreVue.components.FocusTrap';
export default {
name: 'CoreMenu',
- components: {
- FocusTrap,
- },
props: {
// Whether to show if links are currently active
showActive: {
diff --git a/kolibri/core/assets/src/views/FocusTrap.vue b/kolibri/core/assets/src/views/FocusTrap.vue
deleted file mode 100644
index 28b9176a3d..0000000000
--- a/kolibri/core/assets/src/views/FocusTrap.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-