Merge "Add tether preferences into AllInOneTetherSettings"