Merge "Fix colors in bubble settings so they're more visible" into udc-dev