Merge "Fix checkcolor_hook error of Settings" into udc-dev