Merge "Revert "Clean up and refactor load initial colors (1/3)"" into udc-dev