Merge "Various fixes in ShortcutService" into sc-dev