am 2557d8a2: Merge "Wrap text on long preferences." into mnc-dev

* commit '2557d8a25124b93801bc5de1b1b2d063cad1c3ff':
  Wrap text on long preferences.