Merge "Don't set enabled on TaskMenu view if shortcut not available" into sc-dev