Change to fit color name text on color selection spinner in settings.
automerge: a46c723

* commit 'a46c7236b6d71c861b49d20dd7515a9031764909':
  Change to fit color name text on color selection spinner in settings.