Merge "Replace ShortcutType with UserShortcutType to reduce duplicate declaration." into main