Merge "Let lock icon reappear after fingerprint draw off"