Merge "Extend tethering enable/disable timeout to 30 seconds" into main