Merge "Remove ShortcutManager samples from nyc-dev" into nyc-dev