Merge change 22021 into eclair

* changes:
  fix a bug that caused the PixelFormat viewed by Surface to be wrong.