Merge "Change wallpaper sizing"