Merge "Wait for disconnect when rebooting to userspace FB" into main