Merge "Fix concurrent modification error in ShortcutService" into sc-dev