Merge changes from topic "variants_landing" into tm-dev

* changes:
  Add color scheme constructor that takes WallpaperColors & Style objects
  Adjust variants specs to match latest UX spec.