Merge "Bug fix: use legacy SkCanvas regardless of color space tag" into oc-dev