Merge "Fix wallpaper scaling issues" into sc-dev