Merge "[Settingslib][Dialog] Migrate color roles" into main