Merge "Update the colors for bubbles settings based on new spec" into udc-dev