Merge "Adjust padding for wallpaper category grid" into sc-dev