Merge "SF: Remove EventControlThread"