Merge "Merge "Convert bitmaps to sRGB/scRGB when they have a color profile" into oc-dev am: 33813bd4 am: 6869c551"