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