Merge "fskeyring & userspace reboot: support DE keys" into rvc-dev