Merge "Remove userspace reboot" into main