Rework the de-duplication scheme for shortcuts.

Bug: 4646172
Change-Id: I88966f3e910f51711ce49336fb9134d0953930de
2 files changed