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

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