Merge "Keystore: Wire up Ed25519 signing" into tm-dev