Merge commit '8f094ca7d045132ec93d4e903e784a3c077708c3' * commit '8f094ca7d045132ec93d4e903e784a3c077708c3': Fix cleanupConnection when switching from wifi.
Merge commit '8f094ca7d045132ec93d4e903e784a3c077708c3' * commit '8f094ca7d045132ec93d4e903e784a3c077708c3': Fix cleanupConnection when switching from wifi.