Merge "SF: Remove EffectLayer class"