Merge changes from topic "bye-container-layer"

* changes:
  Remove container layer
  SF: Replace container layers with effect layers