Merge "ShortcutManager: When app's data is cleared, remove all shortcuts," into nyc-dev