[TASK] Restore SwitchableControllerActions support