Merge "Fixed NPE in FingerprintAuthClient" into sc-v2-dev