Move relay connection logic into main event loop (#632)

Move relay connection logic into main event loop (#632) #2592