Add cell_max_count for grid size
While in 360dp and 320 dpi, having a grid size bigger than 6x6 made the icon text overlap

Change-Id: I76e2c8cdf734c0c936126df8e08f935fe6ce88b3