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

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