Merge "Merge "Truncate ShortcutInfo Id" into tm-qpr-dev am: d2adae7886" into udc-dev