Merge "Fix NullPointerException when renaming a fingerprint"