Merge change 7521

* changes:
  Adding support for surface views. also removed subplugin's dependency on ANPCanvas.