am 5a40b451: Merge "Change ResizingTextView so that it defaults to leaving line spacing alone" into lmp-mr1-dev

* commit '5a40b451b2d0fd1c746ea8e22c56d0988c40b860':
  Change ResizingTextView so that it defaults to leaving line spacing alone