Merge changes I8df8815a,I4d2305ab,If721b696,I19902da5

* changes:
  SideBySide2: Chunk and comment padding cleanup
  SideBySide2: Fix scrolling alignment errors and reduce jank
  SideBySide2: Fix starting focus on B side instance
  Add simple test for LineMapper.appendReplace