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