Merge changes I6bf48141,I77b7a2e4 into sc-v2-dev

* changes:
  Taskbar drag starts internal pre-drag before system drag
  Let DragView use ActivityContext instead of Launcher