[BUGFIX] Simplify shortcut handling

This patch solves the BC break introduced by the new default value for ``useShortcutUid``.