Merge "SideBySide2: Fix truncated long lines"