Merge changes from topic "themesMay2322" into tm-dev

* changes:
  Update ColorScheme.toString() formatting
  Match latest variant spec; update hue rotation logic
  Match Android's colors to design intent