Merge "ShortcutManager: Break down unit tests" into nyc-mr1-dev