Merge "Added opaque flag check for ColorLayer"