Merge "SF: Fix an EventThread deadlock"