Merge "Fix SurfaceControl#captureLayers when the layer is boundless"