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