Merge "ART: Fix iterator invalidation"