Merge "Always check for the expressive theming flag when returning the...

Merge "Always check for the expressive theming flag when returning the expressive theming state. This will allow toggling the theming on and off in tests." into main