Merge "Fix debugger deadlock."