Merge "Fix BiometricService threading/handling"