Merge "Clean up code based on color picker refactor" into main