Merge "fix ImageView.getImageMatrix()" into jb-mr1-aah-dev