Merge "Refine Settings textColor" into udc-dev