* changes: DO NOT MERGE Set ContainerLayer for buffer-less surface DO NOT MERGE: WM: Restrict SC Builder to set a single surface type Implement construction of container layers
* changes: DO NOT MERGE Set ContainerLayer for buffer-less surface DO NOT MERGE: WM: Restrict SC Builder to set a single surface type Implement construction of container layers