Merge "Remove obsolete TODO in AllInOneTetherSettings"