Merge "keystore_cli_v2: allow newlines in the text prompt"