Merge "Fix color ration for dark mode for device icon" into udc-dev