Merge "Fix small gap between color option quadrants" into udc-dev