Merge changes from topic "biometric_page" into sc-dev

* changes:
  Update confirming credential flow for biometric settings
  Combined biometric settings implementation