Merge "Revert "WallpaperColors hint computation"" into pi-dev