Merge "ART: Fix graph for switch leaving a try block"