Merge "Update fingerprint icon" into mnc-dev