Merge "Updating ThemeManager to be extendible" into main