Merge "Remove unnecessary #ifdef in Color.h/cpp" into main