Merge "Add debug info to timeout exception in _hotplug_server"