Merge "Change nullability of colorspace parameter" into oc-dev