Merge "Improved talkback fingerprint enrollment flow" into mnc-dev