Merge "Implement ConnectivityService TODO and fix many race conditions"