Code refactoring and cleaning related to latest merge
Fixes a layout issue when assigning custom selectionIndicatorHeight value
Enables font customization when not displaying counts