Merge "5/n: Add invalidation plumbing in fingerprint/face providers"