Merge "Truncate ShortcutInfo Id" into tm-dev