Merge "ART: Fix interpreter single-step when doing OSR"