Merge "Work around incorrect Skia gamma" into pi-dev