Fix ThemeSettings FC when DualPanel feature is enabled