Merge change 6823

* changes:
  wifi: Keep the WLAN network interface up whenever wifi is enabled.