Merge change I51d41230 into eclair

* changes:
  Make sure CF icon updates when using "all CF" MMI.