Merge "First-pass for the new RenderEngine interface."