Merge "Simplifying color extraction registration logic" into sc-v2-dev