Merge "Increase rainbow colors legibility" into udc-dev