base

Merge change 8323 into donut

* changes:
  * a best effort fix for apps that uses get/set Matrix API on canvas.   - scale the matrix   - but don't scale if the matrix *looks* like obtained from the canvas itself. (typically to set it back to original matrix)