[7.1-stable] Merge pull request #2728 from sascha-karnatz/overlay-picture-grid-row-height

[7.1-stable] Merge pull request #2728 from sascha-karnatz/overlay-picture-grid-row-height #728