Merge "Fix status icon animations"