Merge "Fixed color contrast on drag handle" into main