Merge "Fix diff chunk navigation and scrolling"