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

Change-Id: I2c8273ee923f1deeed05fecb7413ddb9623edbc3