Merge "Clean up AllInOneTetherSettings" into main