Merge "Add rename support to FingerprintManager"