Merge "Updated API use of ColorScheme and TonalPalette" into tm-qpr-dev