Merge "Fixes an issue in shortcut persistence." into sc-dev