Merge change 22001 into eclair

* changes:
  Fix Wifi+Cell on boot after wifi in use.