Merge "Fixes a potential error in setDynamicShortcut" into sc-dev