Merge "Xform bitmaps to sRGB on SW and PDF canvases" into oc-dev