Increase number of rows if labels are not shown

PS3: Fix rebase derp
PS4: Rebase (_default for defaults)

Change-Id: Ie9d0e6246ac38054226ebc01c143b6d4efdefa26