Merge "ShortcutManager: More command for CTS, more tests.." into nyc-dev