Merge "KeyMint VTS: fix flipped error messages" into main