Merge "Refine color overlay attributes" into sc-dev