Bug Description

This a part of bug #868423, when the workspaces are disabled and the user hits the super key, the shortcut hints should not show the workspace section, and reorder the categories as shown in the attached mockup.