It's OK to put the css--hex-color bugfix on emacs-26, but then please remove it from the changeset you push to master, so that it could be merged from emacs-26. Thanks.