Merge "Fix Wifi screen updating"