Merge change 9287

* changes:
  fixed some issues with the software renderer when surfaces are made current.