Merge "Some Tethering code to SettingsLib and use in QS"