Merge "Fallback to hard reboot if userspace reboot hasn't started in time"