Merge "Pass surface control instead of handle as reference to layers in LayerState"