Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into sc-dev