Merge change 26667 into eclair

* changes:
  Add raster object to control point and line params. Add flag to force SW rendering.