Merge "Make Fingerprint rename and delete user-aware"