Add facia-header-switch
Better naming
Merge branch 'facia-header-switch'