Merge "Fix failing checkcolor_hook in Settings" into udc-dev