Merge "Fix race condition in transition from dream -> hub" into main