Merge "ShortcutManager: Make sure persisted default launcher still exists." into nyc-mr1-dev