Merge "Demo app for ShortcutManager" into nyc-dev