Merge change 9124 into donut

* changes:
  Fix a bug in ImageView: The drawing matrix is not updated when setImageMatrix is called.