Merge "Update fingerprint removal dialog strings" into tm-dev