Merge "Delete non-colormanagement code" into main