Merge "Changed wifi status lines per UX consult"