Merge "Improve color correctness for drawing bitmaps with Skia pipeline"