Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev
am: 2bcfecdb21

Change-Id: I1108a0f097e7f6b1fc47f2551f18e6316688a8f9