Merge "Rename ColorLayer to EffectLayer to handle both shadows and color fill"