Merge "Change icon alignment for collapsed Conversation groups" into sc-dev