Merge change 3572

* changes:
  Changing plugin to use the draw event (not drawContext)