Merge "ART: Enable more passes under try/catch"