Merge changes from topic "biometric-prompt"

* changes:
  Refactor FingerprintDialog to be Biometric
  Clean up interface between controller and view