Merge "Hide new ColorSpace APIs"