Merge "Add mainline module controller for tethering" into main