Merge "Add ColorMatrix removal as an accepted incompatibility"