Merge "Fix ColorMatrix intrinsic." into klp-dev