Merge "Fix JDWP event races"