Merge "[Keystore]Fix abort unsafe check in keystore fuzz" into main