Merge "ChangeScreen2: Respect user preference for unified diff view" into stable-2.9