Merge "Move display mode switch icon to sub header"