Make the column highlighter faces final, and change final logic to give precedence to the base face when both the base and new face are final. Fixes #4669