Merge "DO NOT MERGE. Implement connection error dialogs (1/4)"