Merge changes I06d26609,I0afbacd0 into sc-dev

* changes:
  10/ Update split for shell thread
  9/ Update transitions/starting window for shell thread