Merge changes I37402933,I7b93ad4e into main

* changes:
  Upstream keyguard animation flow optimizations
  Remove reliance on bespoke transition methods