Merge "Fix bug: Add some controllers to AllInOneTetherSettings Lifecycle"