Merge branch 'switchdev-vlan'