Merge "ShortcutManager sample update:" into nyc-dev