Merge "Add theme style flag to WallpaperColors" into oc-dr1-dev am: 8b94ef697e
am: a9682937b6

Change-Id: Id3a0cd1c34166f156d0c94b412ca7d9397e38672