Merge "Unhide IncorrectContextUseViolation" into sc-dev