Merge "Delay animator update on tiles change." into main