Merge "fskeyring & userspace reboot: support DE keys"