Merge "Make CDM UI support dark theme"