Merge "Allow passing in a custom color provider" into main