Merge "Fixed data connection toggle crash in Settings." into lmp-mr1-dev automerge: 5f1eb2d automerge: 49c85c4
automerge: e3acb02

* commit 'e3acb02bb55d69fc7f1a6351927cf9b2ade058f8':
  Fixed data connection toggle crash in Settings.