Merge "Split out RenderProperties"