Merge "Revert "WallpaperColors hint computation"" into pi-dev am: cf2c35dca6
am: 30f0867ee0

Change-Id: Iae41244b5541945304d8965c22602efbd4b32988