Causing too many theming issues/complexity. This will make the Material 3 transition easier. (cherry picked from commit f85dfa90b867c80b7a456c07ee03f99c9b71a987)
Causing too many theming issues/complexity. This will make the Material 3 transition easier. (cherry picked from commit f85dfa90b867c80b7a456c07ee03f99c9b71a987)