Try 2 to merge the WorkingSetSort events
Merge remote-tracking branch 'upstream/master' into tom/issue-2076-take2
Fixes after review
Merge pull request #4450 from TomMalbran/tom/issue-2076-take2

Better fix for #2076: Two indistinguishable events for different cases of working set reordering. Now listening for a single event is enough to track all working set reordering.