Merge "KeyMint VTS: re-order auth failure arms" into main