Merge "Modified StyleManager::SetTheme to prevent ApplyDefaultTheme breaking" into...