Merge "Fix colors for dreams settings according to new spec" into udc-dev