Merge change I204e4787 into eclair

* changes:
  Fix updating Bluetooth icon on status bar and for Wifi.