Merge "Correctly compute diffWidth and diffHeight." into main