Merge "Fix an issue where the return value is null when retrieving shortcut" into sc-dev