Merge changes I5050e67a,I1099cf76 into tm-qpr-dev

* changes:
  Address thread safety issues in WindowLayoutComponentImpl
  Identify and fix potential thread safety issues in SplitController