Merge "Fix the consistency of connection status displayed on Wi-Fi card"