Merge changes I48079ecb,Ifda20367 into main

* changes:
  Revert "Re-use existing method to get split root"
  Revert "Reset leashes before starting taskbar app pair launch animation"