Merge change 23088 into eclair

* changes:
  Fix 2059728: NPE in BaseImageList.getCursor