Merge "Ask user to try fingerprint after face auth fail" into tm-dev