Merge "Ensure that updates to the global event mask are atomic"