Merge "Don't create CE Layer when EffectLayer has nothing to draw." into tm-dev