Merge "Fix for color picker accessibility." into ics-ub-calendar-cream