Merge branch 'code-movement-to-br_switchdev-c'