Merge "Fix error computing tertiary hue" into sc-v2-dev