Merge "Spy may receive events out of order" into main