Merge "Truncate ShortcutInfo Id" into sc-dev