Merge "Keep setting of "TurnOff hotspot automatically" when AP is changed"