Merge "Fix wifi status icon"