am 60ca4f28: (-s ours) DO NOT MERGE. Implement connection error dialogs (3/4)

* commit '60ca4f28e75422814d95dc60a3db2579a14ed6e1':
  DO NOT MERGE. Implement connection error dialogs (3/4)