Merge "Do not register Curve25519 as a key factory directly"