Merge "Fix Wi-Fi hotspot switch UI issue" into tm-dev