Merge "Prevent fingerprint icon from showing when unlocking while fingerprint is in lockout." into sc-dev