Merge "Default device configuration should not have biometric sensors"