Merge change 8821

* changes:
  adding touch support to the paint plugin.