Merge "Don't also skip fingerprint in SUW when skipping face" into sc-dev