Merge changes Ibd2f4111,Ia6cc60bc into rvc-dev

* changes:
  Fix crash in AllInOneTetherSettings when user is not admin
  Refactor new tether settings to remove SharedPreferences