Merge "Adding ThemeManager as a centralized place for controlling icon theming" into main