Some work towards ensuring that 'disabled' actions that have shortcuts don't get get triggered when they shouldn't be (#284).