Merge "Updating Chips UI" into sc-dev