Fix #11682: Screening plate rows with empty wells are too tall (develop)

#1769 rebased onto develop