Merge "Fix possible NPE in fingerprint service provider" into sc-dev