Swap relevant controls when surface type changes. Re #7919
Merge remote branch 'origin/bugfix/7919_render_tab_controls_switch'