Merge "[Conversation Notification] match sync/async image loading" into main