Merge "Fix crash when removing fingerprint" into mnc-dev