Merge "Only doing the icon animations now when expanding slowly"