Merge change 26915 into eclair

* changes:
  Fixed screenshot command line tool to deal with new RawImage