Merge changes Ic3affb60,If09a6623

* changes:
  Fix NopCanvas initialization
  NopCanvas is only hw accelerated during construction