[TASK] Restore SwitchableControllerActions support

Ready to be merged assuming testing goes well.