Merge "Refactor TaskShortcutFactory to return List of SystemShortcuts" into tm-qpr-dev