Merge "Update JDWP event filtering to avoid useless ids"