Merge "Use correct handle scope offset from StackVisitor"