Merge "Adjust basic Fruit Salad colors contrast" into udc-dev