Merge "Put the wifi status icon in the right place."