Merge "Only listen for fingerprint if needed." into mnc-dev