Merge "Resolve message/conversation image Uris with the correct user id" into udc-qpr-dev