Merge "Don't assert tertiary color is null" into sc-dev