Merge "Fix USB tethering grey out behaviour" into tm-dev