Merge "Fix a bug in ContrastColorUtil that was copying NoCopySpan." into main