Merge "Manual start tethering if it doesn't restart automatically"