Merge changes I3b1d1c4e,I11bdad27 into rvc-dev

* changes:
  Let tether preference controllers extend TogglePreferenceController
  Make tether option preferences listen to own SharedPreferences change