Merge change 3686 into donut

* changes:
  Fix cleanupConnection when switching from wifi.