Merge "Add conversion between @NamedDataSpace and ColorSpace.Named enums" into tm-dev