Merge changes I379bd80a,I85ff5ca7 into main

* changes:
  Make KeyguardBlueprint flow a state flow
  Remove layer class from transition.