Merge changes I741b1915,Ida2f23da into sc-dev

* changes:
  2/ Migrate isInOneHanded() in OneHandedState
  1/ Add OneHandedState to manage the transition flow