Merge "Fix getBitmapCrops" into main