Merge "Split out RootRenderNode"