Merge changes Id02aa26e,Iaafb1a0a into sc-dev

* changes:
  Refactor One handed mode Unit tests
  Do not register + unregister DA in the same call