Adding support for updating the pinned shortcuts without updating the ID map
am: 50941fb8a6

Change-Id: I324cb483837f2d9952eb6a38f4513a8f0fb90915