Merge "Show correct Wi-Fi status when switching to multi window mode"