Merge "(3/N) Biometric error dialog" into main