Merge "ART: Preserve loop headers with try/catch"