Merge "Revert "Replace ShortcutType with UserShortcutType to reduce dup..."" into main