Merge change 22163 into eclair

* changes:
  Point Sprites