Merge "Revert color of expand button on unread conversations" into sc-dev