Merge "Conversation visual updates" into sc-dev