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