Fix minimal VCL menu item height with icons

Don't reset the calculated minimal menu item height to the icon
height, if the minimal height is already larger then the icon height.

Change-Id: Ifcd6c750352c4d3f754a693df7254a4654a8afe6