Merge "SF: Fix contradiction in EventThreadTest"