Merge "Always prompt for limited connectivity." into qt-dev am: 4a5a129fb2
am: eabf2d0b8d

Change-Id: I29e8139e908fc68dd656143a19aa2ef142f9108d