Merge "Re-enable color family test" into sc-dev