am 4c0c5cf9: (-s ours) Merge "DO NOT MERGE. Implement connection error dialogs (1/4)" into lmp-preview-dev

* commit '4c0c5cf919dac4708f631a29d7e7537b316e970f':
  DO NOT MERGE. Implement connection error dialogs (1/4)