Merge remote-tracking branch 'origin/bugfix/7901_boolean_params_to_new_API'
Swap relevant controls when surface type changes. Re #7919
Merge branch 'bugfix/7919_render_tab_controls_switch' into develop