Merge \\"ShortcutManager: Make sure persisted default launcher still exists.\\" into nyc-mr1-dev am: 5b080d4e90
am: dfbe377b1d

Change-Id: I83ae3f8be3291c3bc2d8a9a4eb3fe5b66957ce19