Merge change 26983 into eclair

* changes:
  Fix colSpan for screenshot display from 3 to 4 in DDMS.