Merge changes from topic "presubmit-am-2547badef93c4b82b645e06e98481458" into tm-mainline-prod

* changes:
  [automerge] Don't create CE Layer when EffectLayer has nothing to draw. 2p: a3c4d37253
  Don't create CE Layer when EffectLayer has nothing to draw.