Merge change 7707 into donut

* changes:
  * scale surface view's canvas   This will not affect GL/Video views as they're directly using surfce but not canvas.