Merge "Remove On/Off subtext next to the Wi-Fi toggle" into qt-dev