Merge "Hide ColorSpace.Renderer" into oc-dev