Merge "[SingleLineConversationView] Align avatar logic with ConversationLayout" into main