Merge "Fix loaded tile icon animations in compose" into main