Merge "Add a check for color type in property values holder"