Merge "Use Wi-Fi content description in StatusBarWifiView" into pi-dev