Merge "Add flag to not connect in WifiDialogActivity"