Merge "Differentiating max widget cell count and max wallpaper cell count in customization drawer."