Merge "Fix hub timeout not working if dream restarts underneath hub after timeout" into main