Merge "Fix Settings crash after clicking "Add Fingerprint"" into 24D1-dev