Merge changes I05d517a7,Ided0a095 into main

* changes:
  Minor clenaup in LauncherBackAnimationController
  Fix window corner radius for predictive back to home on Felix