Merge "ShortcutManager negative CTS" into nyc-mr1-dev