Merge "Fix links to side-by-side and unified diff screen on edit screen"