Merge "Move LayerType to RenderNode"