Merge "Fix JDWP thread crash."