Merge "FingerprintSettings improvements"