Merge "Revert^3 "Keystore: Validate curve names in XDH and ED25519"" into 24D1-dev