Merge branch 'feat/core/9707-tertiary-reorder-epic-ldml' into fix/developer/9438-vis-kbd-crash-epic-ldml