Keep theme coloring of cells in FocusCellOwnerDrawHighlighter #2585

Job	Run time
check-freeze-period / verify-freeze-period	3s
check-merge-commits / Block Merge Commits	10s
build / Upload Event File	2s
build / Verify Linux	23m 45s
build / Verify Windows	33m 7s
build / Verify MacOS	42m 56s
	1h 40m 3s

Provide feedback