Merge "Update Settings to use new fingerprint API"