Merge "Biometric Credman Layered UI Bugfix" into main