Merge "Use WifiEntry.shouldShowSsid() to show SSID" into main