Merge change 21790 into eclair

* changes:
  Dormant ICON was not being displayed, fixes bug 2039239.