Merge "Add null check in FingerprintDetectClient" into udc-qpr-dev