Merge "Use custom ColorOptionIconView for color options" into udc-dev