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

Change-Id: Ibc3760ce650c8d48f261e6486edb51582391b710