Merge "Ask password when user adds a new fingerprint including a checkbox to ask that if they want to use fingerprints in the future and stores it as shared prefernces." into mnc-dev