Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev