getImageMatrix() does not return "mDrawMatrix", instead it returns mMatrix. This is not reflecting the matrix used in drawing when Bitmap is changed and mDrawMatrix is set to null while mMatrix still holds old invalid data. Change-Id: If24c3118068eca70cfe15786f9715d95c4499f3b