Merge "Revert^2 "Wallpaper Local color sampling"" into sc-dev