Merge changes Ic33d8976,Ib5bd74d8 into sc-dev

* changes:
  Mock connectivity resources in integration tests
  Add overlay options for no internet notifications