Merge "Reconcile MaterialTheme.colorScheme and AndroidColorScheme (1/2)" into main