Merge "ART: Fix critical edge splitting under try/catch"