Merge "Keystore: Wire X25519 key agreement" into tm-dev