Merge "ART: A workaround for a wrongly-read caller's frame"