Increase number of rows if labels are not shown

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

Change-Id: Ie9d0e6246ac38054226ebc01c143b6d4efdefa26
Add options to hide icon labels from drawer and homescreen

Forward port from CM 10.2

PS3: Fix typo
PS4: Rebase and global defaults
PS8: Rebase to head

Issue: There is already an Icon section in general, move both
       settings there or leave separate in their categories?

Change-Id: I90ae4d2357e5f45fa9261c4eaa0fcf287996e327