Merge "wifi: update text displayed during hotspot on/off"