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 rvc-dev am: 15ae228d am: 1d4b9580 -s ours am: b8f5a215 -s ours am: 0ffd1da0 -s ours am: b4cb7e10 -s ours am: ea6c2789 -s ours am: b6aff496 -s ours am: c1683e1b -s ours am: 2a3ad250 -s ours am: 3ce28be8 -s ours am: 717f35e2 -s ours"