Image upload metadata (orientation or width/height) is wrong when uploading without media optimization

[toger5]

• I upload an image from EX android.
• The image is rendered weired on EX and EW (The lowe od the two images is the one WITHOUT media optimization)

In the image metadata one can see that (even though its obviously a portrait image) the w,h metadata is swapped for the actual image but not for the thumbnail.

{
  "content": {
    "body": "photo.jpg",
    "file": {
     ...
      "url": "",
      "v": "v2"
    },
    "info": {
      "h": 2252,
      "mimetype": "image/jpeg",
      "size": 2175322,
      "thumbnail_file": {
...
        "iv": "8rSWx9OF7jcAAAAAAAAAAA",
    ...
          "kty": "oct"
        },
        "url": "mxc://matrix.org",
        "v": "v2"
      },
      "thumbnail_info": {
        "h": 666,
        "mimetype": "image/jpeg",
        "size": 24859,
        "w": 375
      },
      "w": 4000,
      "xyz.amorgan.blurhash": "KFIqZH}%%205wGxuIuM|bI"
    },
    "msgtype": "m.image"
  },
...
  "type": "m.room.message",
  "unsigned": {}
}

Thumbnail: "h": 666,"w": 375
File: "h": 2252, "w": 4000,
It should be ~9:16