Merge changes from topic "am-6dca74afd2444e73b1ab1e32407f3c7b" into main

* changes:
  [automerger skipped] Merge "Resolve message/conversation image Uris with the correct user id" into tm-qpr-dev am: 923bcfc4 -s ours am: ba9d4443 -s ours am: 5a94493f -s ours am: 8aa446f3 -s ours
  [automerger skipped] Resolve message/conversation image Uris with the correct user id am: a63ab761 -s ours am: 2075ea56 -s ours am: db74bfc5 -s ours am: d3256271 -s ours