Merge "Avoid airplane mode labels when Wi-Fi enabled." into ics-mr1