Merge "Revert "Reset the face authenticated state when transitioning to GONE"" into main