Merge "Add toggle for enable/disable auto hotspot off"