am e0d1a9bc: Merge "Line Wrapping General settings Set "Never join already wrapped lines" to true."

* commit 'e0d1a9bcc3279694c57ad273c94ed4975c317797':
  Line Wrapping General settings Set "Never join already wrapped lines" to true.