Merge "Check if we're connected before marking a UID blocked" into nyc-dev