SF: Replace container layers with effect layers

Groundwork before we can collapse all layer types into
a single layer.

Bug: 238781169
Test: presubmit
Test: go/wm-smoke

Change-Id: If53c5fdb266551a6ff30c09dd054e61f4cc488aa
3 files changed