Merge "Updating CreateShortcut activity to use the new ShortcutManager APIs for creating shortcuts"