Merge "Add null check in FaceService#isHardwareDetected"