Merge "Test color space conversion on SW drawBitmap" into oc-dev