Merge "Add context to FingerprintExtPreferencesProvider" into main