Merge "Add LayerId to SurfaceControl and LayerState when created"