Merge "Add layer name to layer_state_t and SurfaceControl"