Merge "Consider a color layer to be opaque if its alpha is 1.0"