Merge "KeyMint: make test more robust to variations" into main