Merge "Moved the waiting for fingerprint string to the hint"