Merge "Properly fail userspace reboot if it's not supported"