Merge "Correctly apply linear filter to drawBitmap(Rect, Rect)"