Merge "Fix fingerprint vhal permanent lockout" into main