Merge "Fix getBitmapCrops when sampleSize != 1" into main