Merge "ChangeScreen2: Honor reverse patch set order preference"