Revert "Merge "Settings: Add missing up navigation in menus" into cm-11.0"

This reverts commit f7137429572c52bc0ca9147eae88c33d87a103fd.