Merge "Show wifi status label in preference summary." into pi-dev