Merge change 5048 into donut

* changes:
  Fix several issues with ImageList.