Merge "Constrain drawBitmap matrix-to-rect optimization" into mnc-dev