Merge "Revert "zuma: enable dynamic color mode"" into main