Merge "Prevent NPE on deleting fingerprint in Settings" into udc-dev