Merge "Change hover state based on color selector" into udc-dev