Merge "Added setting strings for new fingerprint introduction screen" into mnc-dev