Merge changes I46501369,Icd1ddd43 into sc-dev

* changes:
  Revert "Moving taskbar lifecycle to TouchInteractionService"
  Revert "Renaming TaskbarController to LauncherTaskbarUIController"