Merge "SideBySide2: Don't wrap n/p around to find next diff chunk"