Merge "Retry fingerprint or face unlock" into tm-qpr-dev