Merge "Change header background/text/icons color to be system based." into main