Merge "Ensure userspace reboot is supported before logging" into rvc-dev