Merge changes Ifff32118,I2ef0ad18,I2d5621b0,Icef36ab3

* changes:
  SF: Cleanup EventThread Part 2
  SF: Cleanup EventThread Part 1
  SF: Cleanup EventControlThread
  SF: Clang format selected sources