Merge "Fix unexpected Wi-Fi hotspot shutdown" into tm-dev