Merge "Revert "Use colorFilters when rendering to an sRGB bitmap.""