The changes in #8555 are needed in order to be able to offer the desired user experience for dark mode changes.