Merge "Don't increment colorLayerCounter on surface migration" into sc-v2-dev