Merge "Refactor deoptimization support in debugger"