Merge "Update styling of chips fields."