Merge "Revert "Updating ownership of color resources"" into main