Merge "[Wi-Fi] Fix transition mode problems"