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