Clean up code based on color picker refactor

Flag: EXEMPT clean up
Test: manually verified & unit tests
Bug: 350718581
Change-Id: I11d64a4fb3560c2fe5cf387953044dbdd9dbd775
2 files changed