Merge "2/n ConversationLayout: offload conversation icon loading to background thread" into main