Merge "Mitigate CropView invalid Range crash" into main