Merge "Only enable fingerprint auth after first regular auth" into mnc-dev