Merge "Fix regression to drawBitmapArray" into pi-dev