Fix edit key intent, api improvements
Error handling when keyring is not found