Merge "Fix colors in importance and conversation priority preferences" into udc-dev