Merge "Use TetherEnabler in AllInOneTetherSettings to manage master switch"