Merge changes from topic "colorSchemeChanges" into tm-dev

* changes:
  Add 2 chroma to vibrant theme's specification
  Fix color scheme rotation
  Add content color scheme for media