Merge "ChangeScreen2: Add preference to open side-by-side or unified diff view"