Fix some corner cases in WiFi connect/disconnect support

Change-Id: I004da26ff455dad5b2e75b7debdf3c6b2b5ecddf
Signed-off-by: Padmapriya Narayanan <padmapri@qce.qualcomm.com>