Merge "10/n: Remove old biometric UI"