Merge "ART: Refactor VMStack code"