Merge "Cleanup for SystemUI's ColorScheme" into main