Merge "Bring Modern Shade Header carrier text in line with theme" into main