Merge "Fix cancel not working for FingerprintDetectClient" into sc-dev