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