Merge "WallpaperColors refactor" into oc-dr1-dev
am: 04d2ec59e8

Change-Id: I0c684d8f93c368038c3d0328cac58fab576e021f