Merge "Update the layout when the wallpaper count changed" into sc-dev