Merge "Add NPE check to FpDetectClient" into sc-dev