Merge "Remove updateShortcutVisibility" into sc-dev