Merge changes from topic "am-fa7646cd5bad4de3b7338093290d5061"

* changes:
  [automerger skipped] DO NOT MERGE Set ContainerLayer for buffer-less surface am: ff674ee468  -s ours am: 50ac110a5c  -s ours am: 418cc09ab6  -s ours
  [automerger skipped] Implement construction of container layers am: c1ea10447f am: ef7f39f4f5 am: 049902d9eb  -s ours