Merge "[automerger skipped] Merge "Limit the number of shortcuts per app that...
Merge "[automerger skipped] Merge "Limit the number of shortcuts per app that can be retained by system" into tm-dev am: 7b47cfaf am: 4fbf54f9 -s ours am: 67310407 -s ours am: 63b822ee -s ours am: 422e9887 -s ours am: a1158f06 -s ours"