Merge "Fixed fingerprint enroll test" into main