Merge "Wallpaper and non-app targets are not necessary" into sc-dev