Merge change Ic31c11ad into eclair

* changes:
  Fix 2209086: restore drawable states when drawables change.