Merge "Add null check in biometric service"