Merge "Fix JDWP race at runtime shutdown"