Merge "Reduce the iconSize to fit inside the cellSize when display size largest" into main