Merge "Add fingerprint icon" into mnc-dev