Merge "Replace PixelColor ints with Color ints"