Merge "Convert bitmaps to sRGB/scRGB when they have a color profile" into oc-dev