Merge "drawBitmapMatrix is deprecated, code work-around"